1621 commits

Author	SHA1	Message	Date
dependabot-preview[bot]	d841dcf930	Bump pillow from 6.2.1 to 7.1.2 in /src/requirements (#521) ... Bumps [pillow](https://github.com/python-pillow/Pillow) from 6.2.1 to 7.1.2. - [Release notes](https://github.com/python-pillow/Pillow/releases) - [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst) - [Commits](https://github.com/python-pillow/Pillow/compare/6.2.1...7.1.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-17 13:44:28 +02:00
dependabot-preview[bot]	2b96333f96	Bump django-bootstrap3 from 12.0.3 to 12.1.0 in /src/requirements (#527) ... Bumps [django-bootstrap3](https://github.com/dyve/django-bootstrap3) from 12.0.3 to 12.1.0. - [Release notes](https://github.com/dyve/django-bootstrap3/releases) - [Changelog](https://github.com/dyve/django-bootstrap3/blob/master/HISTORY.rst) - [Commits](https://github.com/dyve/django-bootstrap3/compare/v12.0.3...v12.1.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-17 12:44:02 +02:00
dependabot-preview[bot]	6f5ea77780	Bump ipython from 7.13.0 to 7.14.0 in /src/requirements (#528) ... Bumps [ipython](https://github.com/ipython/ipython) from 7.13.0 to 7.14.0. - [Release notes](https://github.com/ipython/ipython/releases) - [Commits](https://github.com/ipython/ipython/compare/7.13.0...7.14.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-17 12:43:17 +02:00
dependabot-preview[bot]	199bbc2d05	Bump django from 3.0.5 to 3.0.6 in /src/requirements (#529) ... Bumps [django](https://github.com/django/django) from 3.0.5 to 3.0.6. - [Release notes](https://github.com/django/django/releases) - [Commits](https://github.com/django/django/compare/3.0.5...3.0.6) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-17 12:36:14 +02:00
dependabot-preview[bot]	00700c10e3	Bump python-magic from 0.4.15 to 0.4.18 in /src/requirements (#530) ... Bumps [python-magic](https://github.com/ahupp/python-magic) from 0.4.15 to 0.4.18. - [Release notes](https://github.com/ahupp/python-magic/releases) - [Commits](https://github.com/ahupp/python-magic/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-17 12:35:55 +02:00
dependabot-preview[bot]	93b5ab2e30	Bump icalendar from 4.0.5 to 4.0.6 in /src/requirements (#531) ... Bumps [icalendar](https://github.com/collective/icalendar) from 4.0.5 to 4.0.6. - [Release notes](https://github.com/collective/icalendar/releases) - [Changelog](https://github.com/collective/icalendar/blob/master/CHANGES.rst) - [Commits](https://github.com/collective/icalendar/compare/4.0.5...4.0.6) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-17 12:35:35 +02:00
dependabot-preview[bot]	ae02d22e27	Bump graphene-django from 2.9.0 to 2.10.0 in /src/requirements (#532) ... Bumps [graphene-django](https://github.com/graphql-python/graphene-django) from 2.9.0 to 2.10.0. - [Release notes](https://github.com/graphql-python/graphene-django/releases) - [Commits](https://github.com/graphql-python/graphene-django/compare/v2.9.0...v2.10.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-17 12:35:14 +02:00
dependabot-preview[bot]	26bd05f940	Bump pre-commit from 2.1.1 to 2.4.0 in /src/requirements (#533) ... Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 2.1.1 to 2.4.0. - [Release notes](https://github.com/pre-commit/pre-commit/releases) - [Changelog](https://github.com/pre-commit/pre-commit/blob/master/CHANGELOG.md) - [Commits](https://github.com/pre-commit/pre-commit/compare/v2.1.1...v2.4.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-05-17 12:34:53 +02:00
Thomas Steen Rasmussen	57cf6eaf56	hide fulfilled wishes from the list, while here set verbose_plural_name and make slug unique in the db.	2020-05-09 14:24:15 +02:00
Thomas Steen Rasmussen	57dce1f887	change the backoffice proxyview so it doesn't use a form, to make it easier to link to stuff	2020-04-25 23:25:56 +02:00
Thomas Steen Rasmussen	ab338e8652	no quoting here	2020-04-25 14:51:19 +02:00
Thomas Steen Rasmussen	222fc8a70d	make BACKOFFICE_PROXY_URLS templateable by ansible	2020-04-25 14:35:19 +02:00
Thomas Steen Rasmussen	a0dfaf0109	add a simple backoffice view to show proxied content for simple html pages (#520) ... Co-authored-by: Thomas Steen Rasmussen <tykling@bornhack.org>	2020-04-25 14:13:25 +02:00
dependabot-preview[bot]	7dbe1c57c3	Bump psycopg2-binary from 2.8.4 to 2.8.5 in /src/requirements ... Bumps [psycopg2-binary](https://github.com/psycopg/psycopg2) from 2.8.4 to 2.8.5. - [Release notes](https://github.com/psycopg/psycopg2/releases) - [Changelog](https://github.com/psycopg/psycopg2/blob/master/NEWS) - [Commits](https://github.com/psycopg/psycopg2/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-04-07 05:39:03 +00:00
dependabot-preview[bot]	ea89140c73	Bump django from 3.0.4 to 3.0.5 in /src/requirements ... Bumps [django](https://github.com/django/django) from 3.0.4 to 3.0.5. - [Release notes](https://github.com/django/django/releases) - [Commits](https://github.com/django/django/compare/3.0.4...3.0.5) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-04-02 05:33:40 +00:00
Vidir Valberg Gudmundsson	6179d1b1ca	Fix #496	2020-03-28 21:28:32 +01:00
Víðir Valberg Guðmundsson	e4b544bf15	Merge pull request #492 from bornhack/dependabot/pip/src/requirements/codecov-2.0.22 ... Bump codecov from 2.0.16 to 2.0.22 in /src/requirements	2020-03-28 13:47:06 +01:00
Víðir Valberg Guðmundsson	a160b42189	Merge pull request #495 from bornhack/dependabot/pip/src/requirements/django-extensions-2.2.9 ... Bump django-extensions from 2.2.8 to 2.2.9 in /src/requirements	2020-03-28 13:46:04 +01:00
Víðir Valberg Guðmundsson	6a00c013b0	Merge pull request #493 from bornhack/dependabot/pip/src/requirements/icalendar-4.0.5 ... Bump icalendar from 4.0.4 to 4.0.5 in /src/requirements	2020-03-28 13:45:25 +01:00
Thomas Steen Rasmussen	3c6fadcf70	kortforsyningen maps (#484) ... * add maps app, add proxy view for kortforsyningen services, add static_src/js/kfmap.js to create leaflet maps with tiles from kortforsyningen, adjust facility views to use the new map, add marker field to FacilityType model to specify marker colour, add js and marker pngs for coloured markers * remove debug print Co-authored-by: Thomas Steen Rasmussen <tykling@bornhack.org>	2020-03-28 11:45:54 +01:00
dependabot-preview[bot]	12737eb0cd	Bump django-extensions from 2.2.8 to 2.2.9 in /src/requirements ... Bumps [django-extensions](https://github.com/django-extensions/django-extensions) from 2.2.8 to 2.2.9. - [Release notes](https://github.com/django-extensions/django-extensions/releases) - [Changelog](https://github.com/django-extensions/django-extensions/blob/master/CHANGELOG.md) - [Commits](https://github.com/django-extensions/django-extensions/compare/2.2.8...2.2.9) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-03-27 05:33:48 +00:00
dependabot-preview[bot]	f72c37a4bc	Bump icalendar from 4.0.4 to 4.0.5 in /src/requirements ... Bumps [icalendar](https://github.com/collective/icalendar) from 4.0.4 to 4.0.5. - [Release notes](https://github.com/collective/icalendar/releases) - [Changelog](https://github.com/collective/icalendar/blob/master/CHANGES.rst) - [Commits](https://github.com/collective/icalendar/compare/4.0.4...4.0.5) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-03-23 05:57:49 +00:00
dependabot-preview[bot]	9bcf732883	Bump codecov from 2.0.16 to 2.0.22 in /src/requirements ... Bumps [codecov](https://github.com/codecov/codecov-python) from 2.0.16 to 2.0.22. - [Release notes](https://github.com/codecov/codecov-python/releases) - [Changelog](https://github.com/codecov/codecov-python/blob/v2.0.22/CHANGELOG.md) - [Commits](https://github.com/codecov/codecov-python/compare/v2.0.16...v2.0.22) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-03-19 05:36:13 +00:00
dependabot-preview[bot]	171966c26b	Bump graphene-django from 2.8.2 to 2.9.0 in /src/requirements ... Bumps [graphene-django](https://github.com/graphql-python/graphene-django) from 2.8.2 to 2.9.0. - [Release notes](https://github.com/graphql-python/graphene-django/releases) - [Commits](https://github.com/graphql-python/graphene-django/compare/v2.8.2...v2.9.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-03-16 05:40:20 +00:00
Víðir Valberg Guðmundsson	b37be009d1	Make server_ready async	2020-03-10 21:11:35 +01:00
Víðir Valberg Guðmundsson	d750105a77	Await do stuff in irc bot (#486)	2020-03-10 21:07:52 +01:00
Víðir Valberg Guðmundsson	5f55abc6bb	Ircbot maybe-fix. Third times the charm? (#485)	2020-03-10 20:16:46 +01:00
Thomas Steen Rasmussen	37a2fb6a93	make entering a DECT phonenumber optional if letters were entered, and handle lowercase letters better	2020-03-10 19:45:23 +01:00
Thomas Steen Rasmussen	e02e912c5d	fix 500 error when including letters in dect number field, update description to clarify that the field is for numbers only. While here, update some other help_texts in the DectRegistration model, and add so numbers can be used in the letters field. Also allow using 0 and 1 in phone numbers, even though they can not be expressed as letters, only as 0 and 1. Fixes #481 and #480	2020-03-10 19:08:28 +01:00
Thomas Steen Rasmussen	8da8ac65c7	admin_static no longer exists in django 3.0, just use static now, fixes #482	2020-03-10 18:49:55 +01:00
Thomas Steen Rasmussen	207caebc94	disconnect post_save signal until #229 is fixed	2020-03-05 14:41:32 +01:00
Thomas Steen Rasmussen	c52bf300ff	Phonebook (#465) ... * first version of dect registration and phonebook functionality, missing export functionality for dect phone system, the rest should more or less work * add a missing button and message * fix typo * add django-oauth-toolkit to implement oauth2 auth for the DECT csv export * remove unused HMAC code * add logger * only show buttons when user is logged in * remove unneeded enctype	2020-03-05 12:31:11 +01:00
Thomas Steen Rasmussen	bf7578a833	Send emails when proposals are accepted/rejected, and when eventinstances are created/updated (#466) ... * fixup labels and help_text for the email field * add email and published columns to speaker proposal table, add published column to event proposal table * send email to user when a speaker or eventproposal is accepted or rejected. Send email to submitter and all speakers when an eventinstance is created, or when the time is updated (event is rescheduled). Fix a few other small things while here.	2020-03-05 12:23:42 +01:00
Vidir Valberg Gudmundsson	7e2981e855	Await sync_to_async in irc bot.	2020-03-05 08:09:07 +01:00
Víðir Valberg Guðmundsson	be47e43969	Merge pull request #476 from bornhack/menu-fix ... Fixed top menu that wrapped around on narrow view	2020-03-05 07:03:26 +01:00
dependabot-preview[bot]	3fbbf9095a	Bump django from 3.0.3 to 3.0.4 in /src/requirements ... Bumps [django](https://github.com/django/django) from 3.0.3 to 3.0.4. - [Release notes](https://github.com/django/django/releases) - [Commits](https://github.com/django/django/compare/3.0.3...3.0.4) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-03-05 05:27:39 +00:00
Thomas Flummer	543616e4b0	Fixed top menu that wrapped around on narrow view ... Fixes issue #475 Also shows link to Orders, Tickets and Creditnotes if relevant in the account menu In addition to the wrapping, the margin of the dropdown menus have also been adjusted a tad	2020-03-04 22:17:15 +01:00
dependabot-preview[bot]	c83ec9469b	Bump ipython from 7.12.0 to 7.13.0 in /src/requirements ... Bumps [ipython](https://github.com/ipython/ipython) from 7.12.0 to 7.13.0. - [Release notes](https://github.com/ipython/ipython/releases) - [Commits](https://github.com/ipython/ipython/compare/7.12.0...7.13.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-03-02 05:44:30 +00:00
Thomas Flummer	e8b295c9ac	Added letterheads for 2020 (#468)	2020-03-01 15:24:32 +01:00
Víðir Valberg Guðmundsson	fda676618b	Merge pull request #463 from bornhack/dependabot/pip/src/requirements/codecov-2.0.16 ... Bump codecov from 2.0.15 to 2.0.16 in /src/requirements	2020-02-25 08:27:35 +01:00
dependabot-preview[bot]	cafda35003	Bump pre-commit from 2.1.0 to 2.1.1 in /src/requirements ... Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 2.1.0 to 2.1.1. - [Release notes](https://github.com/pre-commit/pre-commit/releases) - [Changelog](https://github.com/pre-commit/pre-commit/blob/master/CHANGELOG.md) - [Commits](https://github.com/pre-commit/pre-commit/compare/v2.1.0...v2.1.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-02-25 05:29:11 +00:00
dependabot-preview[bot]	42ccf21efd	Bump codecov from 2.0.15 to 2.0.16 in /src/requirements ... Bumps [codecov](https://github.com/codecov/codecov-python) from 2.0.15 to 2.0.16. - [Release notes](https://github.com/codecov/codecov-python/releases) - [Changelog](https://github.com/codecov/codecov-python/blob/master/CHANGELOG.md) - [Commits](https://github.com/codecov/codecov-python/compare/v2.0.15...v2.0.16) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-02-25 05:28:50 +00:00
Thomas Steen Rasmussen	12a1c9a0ce	Facilities (#458) ... * update font-awesome to 5.12.1 * prefetch members to considerably lower number of SQL queries for team list view * add facilities app with facility feeedback functionality, working on #383 * Add GeoDjango (django.contrib.gis) and switch to PostGIS db backend. Add location field for Facility model. Add django-leaflet to requirements. * better migration names * tweaking travis config, we use py3.7 now, and add postgis * Add qr code support for facilities (visible in the admin). Make facitilies browsable without logging in. Feedback can be submitted without logging in, given the facility UUID, which is not revealed to unauthenticated users. * show quickfeedback icons when creating and when reading feedback * only show anon option if user is logged in * django-reversion somehow went missing from requirements	2020-02-24 23:28:52 +01:00
Vidir Valberg Gudmundsson	df1a6564b7	Fix #365	2020-02-24 09:40:42 +01:00
Thomas Steen Rasmussen	d5d12008de	rename fontawesome css to include version number, so we avoid caching issues when upgrading	2020-02-22 17:40:53 +01:00
Thomas Steen Rasmussen	27f3470f92	fix noscript schedule template, while here add a prefetch_related in the view to reduce number of sql lookups from 116 to 8 for bootstrap data	2020-02-22 17:19:17 +01:00
Thomas Steen Rasmussen	76fcfd7855	lets call this frab exporter 1.0	2020-02-22 16:24:37 +01:00
Thomas Steen Rasmussen	eb18fc2ec5	fix eventinstance uuid migration with this abomination https://docs.djangoproject.com/en/dev/howto/writing-migrations/#migrations-that-add-unique-fields	2020-02-22 16:21:51 +01:00
Víðir Valberg Guðmundsson	b235cb9683	Merge pull request #460 from bornhack/fix_ircbot ... Try to fix the IRC bot	2020-02-22 16:02:09 +01:00
Thomas Steen Rasmussen	4df66e9638	add missing wishlist migration	2020-02-22 15:48:37 +01:00
Thomas Steen Rasmussen	24d2c0d041	add note about the license we decided to use for recordings	2020-02-22 15:47:58 +01:00
Thomas Steen Rasmussen	b6eaaa5f18	Frab xml export (#459) ... * first stab at a frab xml generator * delete unused xsd file * remove camp title from location name * add uuid field to eventinstance and use it in the frab xml	2020-02-22 15:09:12 +01:00
Thomas Steen Rasmussen	33383e6559	Event feedback (#451) ... * Event feedback functionality and related commits: * blackness and isort and flake8 - this branch does not have pre-commit so I forgot :/ * finish backoffice management of eventfeedback * add username to eventfeedback detail panel when viewed in backoffice * Add feedback url to elm schedule. Fix access when user is anonymous. Remove print statement. * one prefetch_related call to rule them all Co-authored-by: Víðir Valberg Guðmundsson <valberg@orn.li>	2020-02-22 14:50:09 +01:00
Víðir Valberg Guðmundsson	9d1fbf5176	Merge pull request #456 from bornhack/dependabot/pip/src/requirements/pre-commit-2.1.0 ... Bump pre-commit from 2.0.1 to 2.1.0 in /src/requirements	2020-02-22 13:46:15 +01:00
Víðir Valberg Guðmundsson	6d330c1b7f	Merge pull request #457 from bornhack/dependabot/pip/src/requirements/channels-redis-2.4.2 ... Bump channels-redis from 2.4.1 to 2.4.2 in /src/requirements	2020-02-22 13:45:44 +01:00
dependabot-preview[bot]	76dc557e5b	Bump channels-redis from 2.4.1 to 2.4.2 in /src/requirements ... Bumps [channels-redis](https://github.com/django/channels_redis) from 2.4.1 to 2.4.2. - [Release notes](https://github.com/django/channels_redis/releases) - [Changelog](https://github.com/django/channels_redis/blob/master/CHANGELOG.txt) - [Commits](https://github.com/django/channels_redis/compare/2.4.1...2.4.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-02-20 05:26:53 +00:00
dependabot-preview[bot]	c474a2559b	Bump django-reversion from 3.0.5 to 3.0.7 in /src/requirements ... Bumps [django-reversion](https://github.com/etianen/django-reversion) from 3.0.5 to 3.0.7. - [Release notes](https://github.com/etianen/django-reversion/releases) - [Changelog](https://github.com/etianen/django-reversion/blob/master/CHANGELOG.rst) - [Commits](https://github.com/etianen/django-reversion/compare/v3.0.5...v3.0.7) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-02-19 21:02:18 +00:00
dependabot-preview[bot]	09a48d0106	Bump pre-commit from 2.0.1 to 2.1.0 in /src/requirements ... Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 2.0.1 to 2.1.0. - [Release notes](https://github.com/pre-commit/pre-commit/releases) - [Changelog](https://github.com/pre-commit/pre-commit/blob/master/CHANGELOG.md) - [Commits](https://github.com/pre-commit/pre-commit/compare/v2.0.1...v2.1.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-02-19 05:27:23 +00:00
dependabot-preview[bot]	7ccafd2a0f	Bump graphene-django from 2.8.1 to 2.8.2 in /src/requirements ... Bumps [graphene-django](https://github.com/graphql-python/graphene-django) from 2.8.1 to 2.8.2. - [Release notes](https://github.com/graphql-python/graphene-django/releases) - [Commits](https://github.com/graphql-python/graphene-django/compare/v2.8.1...v2.8.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-02-18 05:26:11 +00:00
Vidir Valberg Gudmundsson	abf3603bc9	Maybe this fixes the IRC bot?	2020-02-17 21:29:42 +01:00
Thomas Steen Rasmussen	4b396cd7d7	remove stray debug print	2020-02-14 11:41:49 +01:00
Thomas Steen Rasmussen	95b41bdd44	Add first version of a wishlist app - create wishes in the admin for now. Fix a few unrelated things while here: update our date and time formats to be more internationally unambigous, and always show timezone. Also fix an old bug which meant that bornhack.dk/program redirect never worked. (#445)	2020-02-13 22:07:28 +01:00
Thomas Steen Rasmussen	575324f3cc	pin django-allauth version so we force it to upgrade even if it is a dependecy of django-allauth-2fa	2020-02-12 18:12:05 +01:00
Thomas Steen Rasmussen	9d61e554c0	partially revert e652a8156c and readd time.sleep(1) delay between operations, irc3 flood settings do not appear to prevent the bot from flooding itself off :(	2020-02-12 17:45:55 +01:00
Thomas Steen Rasmussen	00af109e2f	add flake8 and isort to pre-commit config, make flake8 and isort happy (#441) ... * add flake8 to pre-commit config, and fixup many things to make flake8 happy * add isort and sort all imports, add to pre-commit and requirements	2020-02-12 13:10:41 +01:00
Víðir Valberg Guðmundsson	8441620376	Merge pull request #437 from bornhack/dependabot/pip/src/requirements/django-debug-toolbar-2.2 ... Bump django-debug-toolbar from 2.1 to 2.2 in /src/requirements	2020-02-11 06:56:31 +01:00
dependabot-preview[bot]	9a48368c3a	Bump django-extensions from 2.2.6 to 2.2.8 in /src/requirements ... Bumps [django-extensions](https://github.com/django-extensions/django-extensions) from 2.2.6 to 2.2.8. - [Release notes](https://github.com/django-extensions/django-extensions/releases) - [Changelog](https://github.com/django-extensions/django-extensions/blob/master/CHANGELOG.md) - [Commits](https://github.com/django-extensions/django-extensions/compare/2.2.6...2.2.8) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-02-11 05:27:18 +00:00
dependabot-preview[bot]	0399ffbe20	Bump graphene-django from 2.8.0 to 2.8.1 in /src/requirements ... Bumps [graphene-django](https://github.com/graphql-python/graphene-django) from 2.8.0 to 2.8.1. - [Release notes](https://github.com/graphql-python/graphene-django/releases) - [Commits](https://github.com/graphql-python/graphene-django/compare/v2.8.0...v2.8.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-02-10 05:34:06 +00:00
Thomas Steen Rasmussen	8b049da938	forgot to add pre-commit to requirements	2020-02-07 18:53:33 +01:00
dependabot-preview[bot]	701ffc71ad	Bump django-debug-toolbar from 2.1 to 2.2 in /src/requirements ... Bumps [django-debug-toolbar](https://github.com/jazzband/django-debug-toolbar) from 2.1 to 2.2. - [Release notes](https://github.com/jazzband/django-debug-toolbar/releases) - [Changelog](https://github.com/jazzband/django-debug-toolbar/blob/master/docs/changes.rst) - [Commits](https://github.com/jazzband/django-debug-toolbar/compare/2.1...2.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-02-07 17:53:22 +00:00
Thomas Steen Rasmussen	3d790c33cb	add pre-commit config for auto black	2020-02-07 18:51:50 +01:00
Thomas Steen Rasmussen	377a77143c	black everything, working on #355	2020-02-07 18:46:34 +01:00
Víðir Valberg Guðmundsson	20f380dfd6	Planked code form betterforms. (Aka django 3.0 upgrade) (#436) ... * Bump django from 2.2.8 to 3.0.2 in /src/requirements Bumps [django](https://github.com/django/django) from 2.2.8 to 3.0.2. - [Release notes](https://github.com/django/django/releases) - [Commits](https://github.com/django/django/compare/2.2.8...3.0.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * Planked code form betterforms. * Remove betterform from requirements. * Try with master of django-allauth-2fa. * Use static templatetag library, staticfiles is gone. * Use newly released django-allauth-2fa 0.8 instead of git url. * Django 3.0.3 is out. Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-02-07 18:21:34 +01:00
Víðir Valberg Guðmundsson	baf43f0e22	Upgrade to django 2.2.9	2020-02-01 05:24:20 +01:00
Víðir Valberg Guðmundsson	3bf3cf03af	Merge pull request #434 from bornhack/dependabot/pip/src/requirements/ipython-7.12.0 ... Bump ipython from 7.10.2 to 7.12.0 in /src/requirements	2020-02-01 05:21:51 +01:00
Víðir Valberg Guðmundsson	42752b38af	Merge pull request #428 from bornhack/dependabot/pip/src/requirements/django-extensions-2.2.6 ... Bump django-extensions from 2.2.5 to 2.2.6 in /src/requirements	2020-02-01 05:21:29 +01:00
Víðir Valberg Guðmundsson	c20cfdb863	Merge pull request #432 from bornhack/dependabot/pip/src/requirements/wheel-0.34.2 ... Bump wheel from 0.33.6 to 0.34.2 in /src/requirements	2020-02-01 05:20:57 +01:00
Vidir Valberg Gudmundsson	c9f302e170	django.contrib.staticfiles.templatetags.staticfiles.static is gone in django 3	2020-02-01 05:09:35 +01:00
dependabot-preview[bot]	261cba6689	Bump ipython from 7.10.2 to 7.12.0 in /src/requirements ... Bumps [ipython](https://github.com/ipython/ipython) from 7.10.2 to 7.12.0. - [Release notes](https://github.com/ipython/ipython/releases) - [Commits](https://github.com/ipython/ipython/compare/7.10.2...7.12.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-02-01 04:02:55 +00:00
dependabot-preview[bot]	eec93dcb6d	Bump django-extensions from 2.2.5 to 2.2.6 in /src/requirements ... Bumps [django-extensions](https://github.com/django-extensions/django-extensions) from 2.2.5 to 2.2.6. - [Release notes](https://github.com/django-extensions/django-extensions/releases) - [Changelog](https://github.com/django-extensions/django-extensions/blob/master/CHANGELOG.md) - [Commits](https://github.com/django-extensions/django-extensions/compare/2.2.5...2.2.6) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-02-01 04:02:18 +00:00
Víðir Valberg Guðmundsson	3f3f6ae909	Merge pull request #429 from bornhack/dependabot/pip/src/requirements/irc3-1.1.5 ... Bump irc3 from 1.1.4 to 1.1.5 in /src/requirements	2020-02-01 05:01:44 +01:00
Víðir Valberg Guðmundsson	75005c97a8	Merge pull request #426 from bornhack/dependabot/pip/src/requirements/django-cors-headers-3.2.1 ... Bump django-cors-headers from 3.2.0 to 3.2.1 in /src/requirements	2020-02-01 05:01:08 +01:00
Vidir Valberg Gudmundsson	ab2f7bc831	Python 2 is sooo last decade.	2020-02-01 04:58:56 +01:00
dependabot-preview[bot]	271f5e3ed9	Bump django-cors-headers from 3.2.0 to 3.2.1 in /src/requirements ... Bumps [django-cors-headers](https://github.com/adamchainz/django-cors-headers) from 3.2.0 to 3.2.1. - [Release notes](https://github.com/adamchainz/django-cors-headers/releases) - [Changelog](https://github.com/adamchainz/django-cors-headers/blob/master/HISTORY.rst) - [Commits](https://github.com/adamchainz/django-cors-headers/compare/3.2.0...3.2.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-02-01 03:48:29 +00:00
dependabot-preview[bot]	7b8e64be72	Bump graphene-django from 2.4.0 to 2.8.0 in /src/requirements ... Bumps [graphene-django](https://github.com/graphql-python/graphene-django) from 2.4.0 to 2.8.0. - [Release notes](https://github.com/graphql-python/graphene-django/releases) - [Commits](https://github.com/graphql-python/graphene-django/compare/v2.4.0...v2.8.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-02-01 03:48:28 +00:00
Víðir Valberg Guðmundsson	52d57136e3	Merge pull request #430 from bornhack/dependabot/pip/src/requirements/django-wkhtmltopdf-3.3.0 ... Bump django-wkhtmltopdf from 3.2.0 to 3.3.0 in /src/requirements	2020-02-01 04:47:17 +01:00
Thomas Flummer	7e6dc6a675	New logos for 2020 and 2021, new favicon package ... includes smaller tweaks to size of small logo in top menu to make it consistant	2020-02-01 00:42:19 +01:00
Thomas Steen Rasmussen	087db0ea81	add new logo to website	2020-01-31 18:55:21 +01:00
dependabot-preview[bot]	77060e0945	Bump wheel from 0.33.6 to 0.34.2 in /src/requirements ... Bumps [wheel](https://github.com/pypa/wheel) from 0.33.6 to 0.34.2. - [Release notes](https://github.com/pypa/wheel/releases) - [Changelog](https://github.com/pypa/wheel/blob/master/docs/news.rst) - [Commits](https://github.com/pypa/wheel/compare/0.33.6...0.34.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-01-31 05:29:57 +00:00
dependabot-preview[bot]	c9ba9e365a	Bump django-wkhtmltopdf from 3.2.0 to 3.3.0 in /src/requirements ... Bumps [django-wkhtmltopdf](https://github.com/incuna/django-wkhtmltopdf) from 3.2.0 to 3.3.0. - [Release notes](https://github.com/incuna/django-wkhtmltopdf/releases) - [Changelog](https://github.com/incuna/django-wkhtmltopdf/blob/master/CHANGELOG.md) - [Commits](https://github.com/incuna/django-wkhtmltopdf/compare/v3.2.0...v3.3.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-01-20 05:36:00 +00:00
dependabot-preview[bot]	e7d81dc161	Bump irc3 from 1.1.4 to 1.1.5 in /src/requirements ... Bumps [irc3](https://github.com/gawel/irc3) from 1.1.4 to 1.1.5. - [Release notes](https://github.com/gawel/irc3/releases) - [Changelog](https://github.com/gawel/irc3/blob/master/CHANGES.rst) - [Commits](https://github.com/gawel/irc3/compare/1.1.4...1.1.5) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-01-20 05:35:36 +00:00
Víðir Valberg Guðmundsson	a475e3d7d5	Merge pull request #416 from bornhack/dependabot/pip/src/requirements/channels-2.4.0 ... Bump channels from 2.3.1 to 2.4.0 in /src/requirements	2019-12-25 21:47:17 +01:00
Víðir Valberg Guðmundsson	a6aefed6d8	Merge pull request #415 from bornhack/dependabot/pip/src/requirements/django-debug-toolbar-2.1 ... Bump django-debug-toolbar from 2.0 to 2.1 in /src/requirements	2019-12-25 21:38:02 +01:00
dependabot-preview[bot]	1185b29d87	Bump channels from 2.3.1 to 2.4.0 in /src/requirements ... Bumps [channels](https://github.com/django/channels) from 2.3.1 to 2.4.0. - [Release notes](https://github.com/django/channels/releases) - [Changelog](https://github.com/django/channels/blob/master/CHANGELOG.txt) - [Commits](https://github.com/django/channels/compare/2.3.1...2.4.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-12-25 18:44:26 +00:00
dependabot-preview[bot]	28d6ede36e	Bump django-debug-toolbar from 2.0 to 2.1 in /src/requirements ... Bumps [django-debug-toolbar](https://github.com/jazzband/django-debug-toolbar) from 2.0 to 2.1. - [Release notes](https://github.com/jazzband/django-debug-toolbar/releases) - [Changelog](https://github.com/jazzband/django-debug-toolbar/blob/master/docs/changes.rst) - [Commits](https://github.com/jazzband/django-debug-toolbar/compare/2.0...2.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-12-25 18:44:08 +00:00
dependabot-preview[bot]	d8db990d0f	Bump django-bootstrap3 from 12.0.1 to 12.0.3 in /src/requirements ... Bumps [django-bootstrap3](https://github.com/dyve/django-bootstrap3) from 12.0.1 to 12.0.3. - [Release notes](https://github.com/dyve/django-bootstrap3/releases) - [Changelog](https://github.com/dyve/django-bootstrap3/blob/master/HISTORY.rst) - [Commits](https://github.com/dyve/django-bootstrap3/compare/v12.0.1...v12.0.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-12-25 18:43:40 +00:00
Vidir Valberg Gudmundsson	6c9082c6d8	Fix 2fa setup.	2019-12-25 19:01:12 +01:00
Vidir Valberg Gudmundsson	8cda197114	Revert "This should work." ... This reverts commit c2b13c7b7d. (Ie. it did not work...)	2019-12-25 19:00:39 +01:00
Vidir Valberg Gudmundsson	c2b13c7b7d	This should work.	2019-12-17 14:03:03 +01:00
Thomas Steen Rasmussen	db19dbc858	graphene django does not support 3.0 yet	2019-12-17 04:00:15 +01:00
Thomas Steen Rasmussen	4e62af2082	update all the things	2019-12-17 03:54:40 +01:00
Thomas Steen Rasmussen	0cb7b688fa	sort products by category weight on shop page	2019-12-16 23:41:05 +01:00
Thomas Steen Rasmussen	81fd6b30e5	remove token, remove 2018 from menu and add 2020	2019-09-07 15:17:46 +02:00
Thomas Steen Rasmussen	d5019d8082	fix dates on 2020 frontpage	2019-09-07 15:13:51 +02:00
Víðir Valberg Guðmundsson	9ee3fb396a	Remove tickets available from 2019 camp detail.	2019-08-17 22:36:54 +02:00
Víðir Valberg Guðmundsson	1258a595b4	Sshhhhhhh... R5sjkjxiYx4QaiVXJHEszYCju7NJBior	2019-08-13 18:12:45 +02:00
Víðir Valberg Guðmundsson	7e0c87957f	It's an old code, sir, but it checks out.	2019-08-13 17:55:15 +02:00
Reynir Björnsson	f000eb0410	Team shifts: display public credit name ... The public credit name is usually more recognizable.	2019-08-12 12:25:59 +02:00
Víðir Valberg Guðmundsson	30e1049dbc	Use the right comment.	2019-08-11 15:59:02 +02:00
Víðir Valberg Guðmundsson	b5e1623cb7	Adding missing th	2019-08-11 13:30:28 +02:00
Víðir Valberg Guðmundsson	78ddb33fcb	More to the shop ticket list.	2019-08-11 13:26:11 +02:00
Víðir Valberg Guðmundsson	814cbb4af5	Add a list over shop tickets.	2019-08-11 13:18:19 +02:00
Víðir Valberg Guðmundsson	4ad2a23158	Moving figcaption up again!	2019-08-09 12:45:51 +02:00
Víðir Valberg Guðmundsson	adee7c58c4	Maybe this breaks the qr code?	2019-08-09 12:11:37 +02:00
Víðir Valberg Guðmundsson	e2404b1778	Merge pull request #372 from bornhack/dependabot/pip/src/requirements/pytz-2019.2 ... Bump pytz from 2019.1 to 2019.2 in /src/requirements	2019-08-09 10:26:27 +02:00
Víðir Valberg Guðmundsson	8465190e75	Merge pull request #374 from bornhack/dependabot/pip/src/requirements/oauthlib-3.1.0 ... Bump oauthlib from 3.0.2 to 3.1.0 in /src/requirements	2019-08-09 10:25:50 +02:00
Víðir Valberg Guðmundsson	db4ff33b87	Merge pull request #376 from bornhack/sponsors ... Added sponsor logo	2019-08-09 10:25:26 +02:00
Víðir Valberg Guðmundsson	6f55bda732	Merge pull request #379 from flokli/qrcode-caption ... qrcode: move caption before qrcode	2019-08-09 10:20:02 +02:00
Florian Klink	807579ec5d	qrcode: move caption before qrcode ... This allows reading the qr code description on small screens (like from the laptop at the infodesk) without scrolling down all the time ;-)	2019-08-08 21:13:25 +02:00
Florian Klink	aa252c3d11	info_desk/scan.html: show quantity if it's a ShopTicket and single_ticket_per_product is set ... fixes #377.	2019-08-08 21:07:57 +02:00
Florian Klink	95e04b3741	ShopTicket: use @property instead of get_orp() method ... This looks much more natural when being used from inside templates.	2019-08-08 21:06:44 +02:00
Thomas Flummer	b72101ab70	Added sponsor logo ... Sponsor: e-tilbudsavis	2019-08-08 16:58:57 +02:00
Víðir Valberg Guðmundsson	9dd6b0b23c	Fix scanning stuff.	2019-08-08 13:06:24 +02:00
Víðir Valberg Guðmundsson	470115a0d9	Search for orders and mark them as paid.	2019-08-08 12:43:59 +02:00
Víðir Valberg Guðmundsson	59dec88c04	Fix subject.	2019-08-08 11:53:46 +02:00
Víðir Valberg Guðmundsson	ddd5b61cd1	Templates fixes.	2019-08-08 11:38:08 +02:00
Thomas Steen Rasmussen	8b0df39d13	missing logger	2019-08-08 11:24:44 +02:00
Thomas Steen Rasmussen	d1c3535c7e	read file as binary	2019-08-08 11:21:53 +02:00
Thomas Steen Rasmussen	f594815685	use .read() so we pass the actual bytes from the file	2019-08-08 11:12:28 +02:00
Víðir Valberg Guðmundsson	17ff6efb8f	Use list_display instead.	2019-08-08 11:11:17 +02:00
Víðir Valberg Guðmundsson	cd66b5fd5d	More email stuff.	2019-08-08 11:09:25 +02:00
Víðir Valberg Guðmundsson	4def56ad92	Adding outgoingemailadmin.	2019-08-08 11:03:46 +02:00
Víðir Valberg Guðmundsson	89d7d95f78	Adding outgoingemailadmin.	2019-08-08 11:01:09 +02:00
Thomas Steen Rasmussen	0be95742a2	missing imports and other small fixes	2019-08-08 10:55:38 +02:00
Thomas Steen Rasmussen	7f95f41055	email sponsor tickets one by one	2019-08-08 10:44:37 +02:00
Víðir Valberg Guðmundsson	38b7cae7d7	Fix missing colon.	2019-08-08 10:28:02 +02:00
Víðir Valberg Guðmundsson	2ba70c692f	Remove multiple attachment code - was not even done	2019-08-08 10:26:47 +02:00
Víðir Valberg Guðmundsson	2751b92cb8	Find the right sponsors.	2019-08-08 10:03:27 +02:00
Víðir Valberg Guðmundsson	74a9e9df71	Check if tickets are generated. Also show if tickets are generated in the admin.	2019-08-08 09:55:06 +02:00
Thomas Steen Rasmussen	ac19a6db4b	add management command to email sponsor tickets	2019-08-08 09:44:47 +02:00
Víðir Valberg Guðmundsson	3600ed6190	Third times the charm?	2019-08-07 23:33:56 +02:00
Víðir Valberg Guðmundsson	c088594e74	Actually add more attachments	2019-08-07 23:29:13 +02:00
Víðir Valberg Guðmundsson	ba23234a15	Multiple attachments on mails	2019-08-07 23:25:52 +02:00
dependabot-preview[bot]	ec2247a9eb	Bump oauthlib from 3.0.2 to 3.1.0 in /src/requirements ... Bumps [oauthlib](https://github.com/oauthlib/oauthlib) from 3.0.2 to 3.1.0. - [Release notes](https://github.com/oauthlib/oauthlib/releases) - [Changelog](https://github.com/oauthlib/oauthlib/blob/master/CHANGELOG.rst) - [Commits](https://github.com/oauthlib/oauthlib/compare/v3.0.2...v3.1.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-08-07 05:45:00 +00:00
Víðir Valberg Guðmundsson	943dcf8abd	Add Mikjaer Studios logo.	2019-08-06 12:07:41 +02:00
Thomas Flummer	540bfdcbac	Added more sponsor logos ... Added Umbraco, Dansk Magisterforening and zibra group	2019-08-06 11:51:12 +02:00
Víðir Valberg Guðmundsson	94a142f6b9	Polishing finding tickets by scanning and marking stuff as handed out/checked in.	2019-08-04 00:18:52 +02:00
Víðir Valberg Guðmundsson	7be4aa6545	Ticket tokens and badge tokens can be blank since we generate them on save. Also use the correct method for generating badge tokens, and do a small regression test for that.	2019-08-03 22:53:01 +02:00
Víðir Valberg Guðmundsson	b842bb99e7	Upgrade django to 2.2.4	2019-08-01 20:26:48 +02:00
Víðir Valberg Guðmundsson	08d0dd7161	Make provided laptop default=True.	2019-08-01 09:34:00 +02:00
dependabot-preview[bot]	dbd7a30e20	Bump pytz from 2019.1 to 2019.2 in /src/requirements ... Bumps [pytz](https://github.com/stub42/pytz) from 2019.1 to 2019.2. - [Release notes](https://github.com/stub42/pytz/releases) - [Commits](https://github.com/stub42/pytz/compare/release_2019.1...release_2019.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-08-01 05:38:56 +00:00
Víðir Valberg Guðmundsson	b89f09105c	Make team guide only visible for approved members. Fix #369.	2019-07-31 21:14:17 +02:00
Víðir Valberg Guðmundsson	80793d3d1d	Add "use_provided_speaker_laptop" to eventproposal_detail.html. Also correct a typo.	2019-07-31 20:22:11 +02:00
Víðir Valberg Guðmundsson	5748f9c1ee	Fix tests - I think.	2019-07-31 20:12:58 +02:00
Víðir Valberg Guðmundsson	7236462023	Adding "use_provided_speaker_laptop" to EventProposal.	2019-07-31 12:47:38 +02:00
Víðir Valberg Guðmundsson	f1ce253d4a	Fix some stuff for new tickets. Also fix bootstrap-dev script.	2019-07-30 23:38:03 +02:00
Víðir Valberg Guðmundsson	7dc82ee4ee	Merge pull request #370 from bornhack/ticket_type_create_single_ticket_option ... Add "single_ticket_per_product" boolean to ticket types	2019-07-30 22:58:36 +02:00
Víðir Valberg Guðmundsson	9f251c85a6	Merge pull request #367 from bornhack/dependabot/pip/src/requirements/ipython-7.7.0 ... Bump ipython from 7.6.1 to 7.7.0 in /src/requirements	2019-07-30 22:53:53 +02:00
Víðir Valberg Guðmundsson	0373816355	Add "single_ticket_per_product" boolean to ticket types so we can control ticket creation.	2019-07-30 22:51:01 +02:00
dependabot-preview[bot]	c8a4eb1f78	Bump coverage from 4.5.3 to 4.5.4 in /src/requirements ... Bumps [coverage](https://github.com/nedbat/coveragepy) from 4.5.3 to 4.5.4. - [Release notes](https://github.com/nedbat/coveragepy/releases) - [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst) - [Commits](https://github.com/nedbat/coveragepy/compare/coverage-4.5.3...coverage-4.5.4) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-07-30 05:38:22 +00:00
Thomas Steen Rasmussen	024f5dd093	this was probably what it was meant to be	2019-07-30 01:46:27 +02:00
Víðir Valberg Guðmundsson	2c8f04a9a0	Merge pull request #361 from bornhack/backoffice_invoice_scanning ... Save ticket tokens to db. Rename some fields to make using tickets more sane. Initial scanning of tickets.	2019-07-29 22:41:37 +02:00
Víðir Valberg Guðmundsson	55860efb8c	Add create tickets action for orders.	2019-07-29 22:32:49 +02:00
Víðir Valberg Guðmundsson	7a2127d1ff	Make it easier to set ticket type for products.	2019-07-29 21:31:07 +02:00
Víðir Valberg Guðmundsson	70984ab40f	Remove unused template.	2019-07-29 21:26:31 +02:00
Víðir Valberg Guðmundsson	c954363f3e	Merge branch 'master' into backoffice_invoice_scanning	2019-07-29 21:17:27 +02:00
Víðir Valberg Guðmundsson	5d3cfe6210	Order tickets in account page.	2019-07-29 21:16:48 +02:00
Thomas Steen Rasmussen	444aa59159	s/name/title/g	2019-07-29 17:00:25 +02:00
dependabot-preview[bot]	d9fa973e4b	Bump ipython from 7.6.1 to 7.7.0 in /src/requirements ... Bumps [ipython](https://github.com/ipython/ipython) from 7.6.1 to 7.7.0. - [Release notes](https://github.com/ipython/ipython/releases) - [Commits](https://github.com/ipython/ipython/compare/7.6.1...7.7.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-07-29 05:56:22 +00:00
Thomas Flummer	62db982c59	Added higer resolution sponsor logos (#366) ... * Added higer resolution sponsor logos Better for higher DPI monitors * Added Siteimprove logo	2019-07-28 19:51:30 +02:00
Víðir Valberg Guðmundsson	5eec38d344	It is BornHack with a capital H.	2019-07-26 14:52:06 +02:00
Víðir Valberg Guðmundsson	b7feb96c9b	Adding a badge token to tickets that grant that.	2019-07-24 21:08:36 +02:00
Víðir Valberg Guðmundsson	f0bfb42ca8	Merge pull request #363 from bornhack/dependabot/pip/src/requirements/django-extensions-2.2.1 ... Bump django-extensions from 2.1.9 to 2.2.1 in /src/requirements	2019-07-23 22:34:29 +02:00
Víðir Valberg Guðmundsson	0a67177e5f	Merge pull request #351 from bornhack/dependabot/pip/src/requirements/pillow-6.1.0 ... Bump pillow from 6.0.0 to 6.1.0 in /src/requirements	2019-07-23 22:02:34 +02:00
dependabot-preview[bot]	5dc55d03a7	Bump django-extensions from 2.1.9 to 2.2.1 in /src/requirements ... Bumps [django-extensions](https://github.com/django-extensions/django-extensions) from 2.1.9 to 2.2.1. - [Release notes](https://github.com/django-extensions/django-extensions/releases) - [Changelog](https://github.com/django-extensions/django-extensions/blob/master/CHANGELOG.md) - [Commits](https://github.com/django-extensions/django-extensions/compare/2.1.9...2.2.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-07-23 20:02:07 +00:00
Víðir Valberg Guðmundsson	04d858adf3	Merge branch 'master' into backoffice_invoice_scanning	2019-07-23 21:55:31 +02:00
Víðir Valberg Guðmundsson	8beb90a824	Only make it sticky when there is space.	2019-07-23 21:50:21 +02:00
Víðir Valberg Guðmundsson	ee00ae3ee5	Make info page more "browsable".	2019-07-23 21:43:09 +02:00
Víðir Valberg Guðmundsson	2627055077	Fix tests.	2019-07-23 21:15:19 +02:00
Thomas Steen Rasmussen	ca0ed4fb27	redirect back to shop after adding something to an order, and make link to shopping cart bigger	2019-07-21 16:27:25 +02:00
Thomas Steen Rasmussen	8de597d5e5	better wording on bank transfer page	2019-07-21 15:55:14 +02:00
Thomas Steen Rasmussen	d276032389	better subjects for content team emails, and add quotes in body	2019-07-21 15:26:57 +02:00
lgandersen	413f6bb276	Added new pictures for the frontpages of camp 2019, 2020 and 2021. (#362)	2019-07-21 14:56:37 +02:00
Víðir Valberg Guðmundsson	cad3b21fc4	handed_out -> ticket_generated	2019-07-18 21:20:29 +02:00
Víðir Valberg Guðmundsson	b1b810f165	Rename handed_out field on ORP to ticket_generated. Rename checked_in on tickets to used. Add save token migration.	2019-07-18 21:04:49 +02:00
Thomas Steen Rasmussen	9fc13e43bc	make some more room on the proforma invoice because multipage pdf generation is fucked right now	2019-07-18 11:09:25 +02:00
Víðir Valberg Guðmundsson	ceb20bc24b	Adding a button with link to shop on the 2019 frontpage.	2019-07-18 10:03:08 +02:00
Víðir Valberg Guðmundsson	5911d2042b	Initial work on a more lean infodesk.	2019-07-17 22:02:47 +02:00
Víðir Valberg Guðmundsson	0df4395787	Merge pull request #357 from bornhack/dependabot/pip/src/requirements/django-bootstrap3-11.1.0 ... Bump django-bootstrap3 from 11.0.0 to 11.1.0 in /src/requirements	2019-07-17 08:57:08 +02:00
Víðir Valberg Guðmundsson	f9b388e23b	Merge pull request #358 from bornhack/dependabot/pip/src/requirements/graphene-django-2.4.0 ... Bump graphene-django from 2.3.2 to 2.4.0 in /src/requirements	2019-07-17 08:56:31 +02:00
Víðir Valberg Guðmundsson	9d9fe57266	Merge pull request #359 from bornhack/sponsors ... Added new sponsor logos	2019-07-17 08:56:09 +02:00
dependabot-preview[bot]	879a62d4fa	Bump django-filter from 2.1.0 to 2.2.0 in /src/requirements ... Bumps [django-filter](https://github.com/carltongibson/django-filter) from 2.1.0 to 2.2.0. - [Release notes](https://github.com/carltongibson/django-filter/releases) - [Changelog](https://github.com/carltongibson/django-filter/blob/master/CHANGES.rst) - [Commits](https://github.com/carltongibson/django-filter/compare/2.1.0...2.2.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-07-17 05:36:11 +00:00
Thomas Flummer	70a7157734	Added new sponsor logos ... - SiLabs - Dansk Magisterforening	2019-07-16 12:07:51 +02:00
Thomas Steen Rasmussen	939d17c8bd	use event_type from last event from the loop, fix backtrace when updating a speakerproposal which has more than one eventproposal of the same type	2019-07-16 10:35:19 +02:00
dependabot-preview[bot]	0c53ae33c8	Bump graphene-django from 2.3.2 to 2.4.0 in /src/requirements ... Bumps [graphene-django](https://github.com/graphql-python/graphene-django) from 2.3.2 to 2.4.0. - [Release notes](https://github.com/graphql-python/graphene-django/releases) - [Commits](https://github.com/graphql-python/graphene-django/compare/v2.3.2...v2.4.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-07-15 06:00:24 +00:00
Thomas Steen Rasmussen	5fa07f130a	add author field to rideshare, add help_text on all rideshare fields, fixup the rideshare templates a bit	2019-07-13 09:27:14 +02:00
Thomas Steen Rasmussen	2cad801769	make rideshare table sortable	2019-07-11 21:08:46 +02:00
Thomas Steen Rasmussen	9193ebcae6	pull button right	2019-07-11 20:56:09 +02:00
Thomas Steen Rasmussen	e4f6670c45	fixup rideshare a bit	2019-07-11 20:48:14 +02:00
Thomas Steen Rasmussen	881b0f4cf4	add the word Included to the VAT line on customorder invoices	2019-07-11 08:02:04 +02:00
dependabot-preview[bot]	83753cbcee	Bump django-bootstrap3 from 11.0.0 to 11.1.0 in /src/requirements ... Bumps [django-bootstrap3](https://github.com/dyve/django-bootstrap3) from 11.0.0 to 11.1.0. - [Release notes](https://github.com/dyve/django-bootstrap3/releases) - [Changelog](https://github.com/dyve/django-bootstrap3/blob/master/HISTORY.rst) - [Commits](https://github.com/dyve/django-bootstrap3/compare/11.0.0...11.1.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-07-10 05:39:05 +00:00
Víðir Valberg Guðmundsson	24c95a82fd	Don't empty out comment and invoice address when closing order.	2019-07-09 21:03:56 +02:00
Thomas Steen Rasmussen	5359ca6a35	add djangodenmark sponsor logo	2019-07-09 14:05:27 +02:00
Thomas Steen Rasmussen	928ab96437	also generate for instances where pdf is None (happens after instantiating a new)	2019-07-09 11:46:25 +02:00
Víðir Valberg Guðmundsson	fa855fb69e	Add cancel and proforma buttons to review and pay template.	2019-07-09 10:59:03 +02:00
Víðir Valberg Guðmundsson	3ba33649cb	Redirect to review if the order is closed but not paid. Also remove the option to remove products when the order is closed.	2019-07-09 10:46:30 +02:00
Thomas Steen Rasmussen	effd900b62	add proforma invoice support	2019-07-09 10:38:14 +02:00
Víðir Valberg Guðmundsson	fef09baa3d	Make review and pay button save changes made to order. Also move shop related templates back into shop app.	2019-07-09 10:07:00 +02:00
Víðir Valberg Guðmundsson	9adc2a878f	Add "review and pay" as a step in order payment. (#356)	2019-07-09 00:29:18 +02:00
Víðir Valberg Guðmundsson	1f2652d134	WIP Refactor of bootstrap-devsite (#234) ... * Remove some repitition to make adding stuff like camps a bit better. * added camp colours and changed to use example.com addresses * tweaks to get factory boy to correctly save the profiles also changed to use django specific subclass of factory boy * Changed structure and added a few more models Structure changed to have methods for each category, that are then called for a better overview. Also: - Added SponsorTiers and Sponsors - Added Tokens and TokenFinds - Added 2021 - Uses faker for longer descriptions * Added blackness to new bootstrap script	2019-07-08 21:01:20 +02:00
Víðir Valberg Guðmundsson	cad6c3f0d6	Merge pull request #350 from bornhack/dependabot/pip/src/requirements/ipython-7.6.1 ... Bump ipython from 7.5.0 to 7.6.1 in /src/requirements	2019-07-08 16:03:21 +02:00
Víðir Valberg Guðmundsson	d398dc44f7	Merge pull request #352 from bornhack/dependabot/pip/src/requirements/oauthlib-3.0.2 ... Bump oauthlib from 3.0.1 to 3.0.2 in /src/requirements	2019-07-08 16:03:04 +02:00
Víðir Valberg Guðmundsson	f2961505a8	Merge pull request #349 from bornhack/dependabot/pip/src/requirements/django-2.2.3 ... Bump django from 2.2.2 to 2.2.3 in /src/requirements	2019-07-08 16:01:53 +02:00
Thomas Flummer	4656d5b6a8	Smaller logo in letterhead (#353) ... To prevent logo from overlapping test on eg. invoices	2019-07-08 15:21:31 +02:00
dependabot-preview[bot]	74c8ea8342	Bump oauthlib from 3.0.1 to 3.0.2 in /src/requirements ... Bumps [oauthlib](https://github.com/oauthlib/oauthlib) from 3.0.1 to 3.0.2. - [Release notes](https://github.com/oauthlib/oauthlib/releases) - [Changelog](https://github.com/oauthlib/oauthlib/blob/master/CHANGELOG.rst) - [Commits](https://github.com/oauthlib/oauthlib/compare/v3.0.1...v3.0.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-07-05 05:32:55 +00:00
dependabot-preview[bot]	7f433c18b7	Bump pillow from 6.0.0 to 6.1.0 in /src/requirements ... Bumps [pillow](https://github.com/python-pillow/Pillow) from 6.0.0 to 6.1.0. - [Release notes](https://github.com/python-pillow/Pillow/releases) - [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst) - [Commits](https://github.com/python-pillow/Pillow/compare/6.0.0...6.1.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-07-04 05:56:31 +00:00
dependabot-preview[bot]	7efb55b6c1	Bump ipython from 7.5.0 to 7.6.1 in /src/requirements ... Bumps [ipython](https://github.com/ipython/ipython) from 7.5.0 to 7.6.1. - [Release notes](https://github.com/ipython/ipython/releases) - [Commits](https://github.com/ipython/ipython/compare/7.5.0...7.6.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-07-04 05:55:39 +00:00
dependabot-preview[bot]	d8668367fe	Bump django from 2.2.2 to 2.2.3 in /src/requirements ... Bumps [django](https://github.com/django/django) from 2.2.2 to 2.2.3. - [Release notes](https://github.com/django/django/releases) - [Commits](https://github.com/django/django/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-07-02 05:36:07 +00:00
Víðir Valberg Guðmundsson	8ce7bce383	Redirect only if user is not superuser.	2019-06-24 15:56:09 +02:00
Víðir Valberg Guðmundsson	2172d7caf3	Woops forgot the migration.	2019-06-24 15:48:14 +02:00
Víðir Valberg Guðmundsson	6536a05e03	Woops forgot the migration.	2019-06-24 15:45:56 +02:00
Víðir Valberg Guðmundsson	3348d96d06	Add show_schedule boolean to Camp. Hide schedule link if schedule should not be shown. Close #346	2019-06-24 15:12:14 +02:00
Víðir Valberg Guðmundsson	04b8c37f76	Merge pull request #344 from bornhack/dependabot/pip/src/requirements/graphene-django-2.3.2 ... Bump graphene-django from 2.2.0 to 2.3.2 in /src/requirements	2019-06-24 15:04:23 +02:00
Víðir Valberg Guðmundsson	de2eacaccf	Merge pull request #345 from bornhack/dependabot/pip/src/requirements/django-debug-toolbar-2.0 ... Bump django-debug-toolbar from 1.11 to 2.0 in /src/requirements	2019-06-24 15:04:11 +02:00
dependabot-preview[bot]	fc96784b9b	Bump unidecode from 1.0.23 to 1.1.1 in /src/requirements ... Bumps [unidecode](https://github.com/kmike/text-unidecode) from 1.0.23 to 1.1.1. - [Release notes](https://github.com/kmike/text-unidecode/releases) - [Commits](https://github.com/kmike/text-unidecode/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-06-24 05:55:53 +00:00
dependabot-preview[bot]	191e390829	Bump django-debug-toolbar from 1.11 to 2.0 in /src/requirements ... Bumps [django-debug-toolbar](https://github.com/jazzband/django-debug-toolbar) from 1.11 to 2.0. - [Release notes](https://github.com/jazzband/django-debug-toolbar/releases) - [Changelog](https://github.com/jazzband/django-debug-toolbar/blob/master/docs/changes.rst) - [Commits](https://github.com/jazzband/django-debug-toolbar/compare/1.11...2.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-06-21 05:50:52 +00:00
dependabot-preview[bot]	2fb80fe68e	Bump graphene-django from 2.2.0 to 2.3.2 in /src/requirements ... Bumps [graphene-django](https://github.com/graphql-python/graphene-django) from 2.2.0 to 2.3.2. - [Release notes](https://github.com/graphql-python/graphene-django/releases) - [Commits](https://github.com/graphql-python/graphene-django/compare/v2.2.0...v2.3.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-06-21 05:50:23 +00:00
Víðir Valberg Guðmundsson	226fb37aa1	Fix speakerproposal form to have email as not required (set to logged in user if not filled out)	2019-06-16 15:59:12 +02:00
Víðir Valberg Guðmundsson	f1da1f3599	Merge pull request #313 from bornhack/dependabot/pip/src/requirements/channels-2.2.0 ... Bump channels from 2.1.7 to 2.2.0 in /src/requirements	2019-06-16 15:08:15 +02:00
Víðir Valberg Guðmundsson	bf2f0c7898	Blackness.	2019-06-16 14:32:24 +02:00
Víðir Valberg Guðmundsson	09c37de106	Merge pull request #329 from bornhack/dependabot/pip/src/requirements/django-cors-headers-3.0.2 ... Bump django-cors-headers from 2.5.2 to 3.0.2 in /src/requirements	2019-06-16 13:48:06 +02:00
Víðir Valberg Guðmundsson	ec3b5c0614	Merge pull request #317 from bornhack/dependabot/pip/src/requirements/ipython-7.5.0 ... Bump ipython from 7.4.0 to 7.5.0 in /src/requirements	2019-06-16 13:45:51 +02:00
dependabot-preview[bot]	1e8f1c6164	Bump channels from 2.1.7 to 2.2.0 in /src/requirements ... Bumps [channels](https://github.com/django/channels) from 2.1.7 to 2.2.0. - [Release notes](https://github.com/django/channels/releases) - [Changelog](https://github.com/django/channels/blob/master/CHANGELOG.txt) - [Commits](https://github.com/django/channels/compare/2.1.7...2.2.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-06-16 11:45:46 +00:00
Víðir Valberg Guðmundsson	d2e2ab60b7	Merge pull request #320 from bornhack/dependabot/pip/src/requirements/commonmark-0.9.0 ... Bump commonmark from 0.8.1 to 0.9.0 in /src/requirements	2019-06-16 13:44:40 +02:00
dependabot-preview[bot]	343d82979c	Bump django-cors-headers from 2.5.2 to 3.0.2 in /src/requirements ... Bumps [django-cors-headers](https://github.com/ottoyiu/django-cors-headers) from 2.5.2 to 3.0.2. - [Release notes](https://github.com/ottoyiu/django-cors-headers/releases) - [Changelog](https://github.com/ottoyiu/django-cors-headers/blob/master/HISTORY.rst) - [Commits](https://github.com/ottoyiu/django-cors-headers/compare/2.5.2...3.0.2)	2019-06-16 11:42:31 +00:00
Víðir Valberg Guðmundsson	38edacac95	Merge pull request #328 from bornhack/dependabot/pip/src/requirements/django-reversion-3.0.4 ... Bump django-reversion from 3.0.3 to 3.0.4 in /src/requirements	2019-06-16 13:41:18 +02:00
dependabot-preview[bot]	e8c12a5865	Bump ipython from 7.4.0 to 7.5.0 in /src/requirements ... Bumps [ipython](https://github.com/ipython/ipython) from 7.4.0 to 7.5.0. - [Release notes](https://github.com/ipython/ipython/releases) - [Commits](https://github.com/ipython/ipython/compare/7.4.0...7.5.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-06-16 11:11:50 +00:00
dependabot-preview[bot]	3248568160	Bump django-reversion from 3.0.3 to 3.0.4 in /src/requirements ... Bumps [django-reversion](https://github.com/etianen/django-reversion) from 3.0.3 to 3.0.4. - [Release notes](https://github.com/etianen/django-reversion/releases) - [Changelog](https://github.com/etianen/django-reversion/blob/master/CHANGELOG.rst) - [Commits](https://github.com/etianen/django-reversion/compare/v3.0.3...v3.0.4) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-06-16 11:10:48 +00:00
Víðir Valberg Guðmundsson	b682d88645	Merge pull request #332 from bornhack/dependabot/pip/src/requirements/psycopg2-binary-2.8.3 ... Bump psycopg2-binary from 2.7.7 to 2.8.3 in /src/requirements	2019-06-16 13:10:24 +02:00
Víðir Valberg Guðmundsson	cf82a69d5e	Merge pull request #326 from bornhack/dependabot/pip/src/requirements/requests-2.22.0 ... Bump requests from 2.21.0 to 2.22.0 in /src/requirements	2019-06-16 13:09:32 +02:00
Víðir Valberg Guðmundsson	8c00cc123c	Merge pull request #323 from bornhack/dependabot/pip/src/requirements/factory-boy-2.12.0 ... Bump factory-boy from 2.11.1 to 2.12.0 in /src/requirements	2019-06-16 13:09:16 +02:00
Víðir Valberg Guðmundsson	d2b9e7508b	Merge pull request #331 from bornhack/dependabot/pip/src/requirements/django-extensions-2.1.9 ... Bump django-extensions from 2.1.6 to 2.1.9 in /src/requirements	2019-06-16 13:09:03 +02:00
dependabot-preview[bot]	b6d29a074c	Bump psycopg2-binary from 2.7.7 to 2.8.3 in /src/requirements ... Bumps [psycopg2-binary](https://github.com/psycopg/psycopg2) from 2.7.7 to 2.8.3. - [Release notes](https://github.com/psycopg/psycopg2/releases) - [Changelog](https://github.com/psycopg/psycopg2/blob/master/NEWS) - [Commits](https://github.com/psycopg/psycopg2/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-06-14 08:46:40 +00:00
dependabot-preview[bot]	193e13557f	Bump django-extensions from 2.1.6 to 2.1.9 in /src/requirements ... Bumps [django-extensions](https://github.com/django-extensions/django-extensions) from 2.1.6 to 2.1.9. - [Release notes](https://github.com/django-extensions/django-extensions/releases) - [Changelog](https://github.com/django-extensions/django-extensions/blob/master/CHANGELOG.md) - [Commits](https://github.com/django-extensions/django-extensions/compare/2.1.6...2.1.9) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-06-11 08:42:50 +00:00
dependabot-preview[bot]	8b58aad273	[Security] Bump django from 2.2.1 to 2.2.2 in /src/requirements ... Bumps [django](https://github.com/django/django) from 2.2.1 to 2.2.2. **This update includes security fixes.** - [Release notes](https://github.com/django/django/releases) - [Commits](https://github.com/django/django/compare/2.2.1...2.2.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-06-10 20:18:29 +00:00
dependabot[bot]	a7147bbed1	Bump requests from 2.21.0 to 2.22.0 in /src/requirements ... Bumps [requests](https://github.com/requests/requests) from 2.21.0 to 2.22.0. - [Release notes](https://github.com/requests/requests/releases) - [Changelog](https://github.com/kennethreitz/requests/blob/master/HISTORY.md) - [Commits](https://github.com/requests/requests/compare/v2.21.0...v2.22.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-05-17 06:55:23 +00:00
dependabot[bot]	0be4a08e93	Bump factory-boy from 2.11.1 to 2.12.0 in /src/requirements ... Bumps [factory-boy](https://github.com/FactoryBoy/factory_boy) from 2.11.1 to 2.12.0. - [Release notes](https://github.com/FactoryBoy/factory_boy/releases) - [Changelog](https://github.com/FactoryBoy/factory_boy/blob/master/docs/changelog.rst) - [Commits](https://github.com/FactoryBoy/factory_boy/compare/2.11.1...2.12.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-05-13 06:47:57 +00:00
Thomas Flummer	7ed9bec954	New logo on 2019 frontpage (#322)	2019-05-12 18:57:04 +02:00
Thomas Flummer	aea79750ee	Added letterheads for 2019 (#321)	2019-05-12 18:37:35 +02:00
Thomas Steen Rasmussen	a67ccf4b81	add bank account details to contact page	2019-05-12 18:04:32 +02:00
dependabot[bot]	de513e2b77	Bump commonmark from 0.8.1 to 0.9.0 in /src/requirements ... Bumps [commonmark](https://github.com/rtfd/CommonMark-py) from 0.8.1 to 0.9.0. - [Release notes](https://github.com/rtfd/CommonMark-py/releases) - [Changelog](https://github.com/rtfd/commonmark.py/blob/master/CHANGELOG.md) - [Commits](https://github.com/rtfd/CommonMark-py/compare/0.8.1...0.9.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-05-03 06:53:10 +00:00
dependabot[bot]	6d32dc569c	Bump django from 2.2 to 2.2.1 in /src/requirements ... Bumps [django](https://github.com/django/django) from 2.2 to 2.2.1. - [Release notes](https://github.com/django/django/releases) - [Commits](https://github.com/django/django/compare/2.2...2.2.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-05-02 06:55:46 +00:00
dependabot[bot]	179ac88f8d	Bump django-bleach from 0.5.2 to 0.5.3 in /src/requirements ... Bumps [django-bleach](https://github.com/marksweb/django-bleach) from 0.5.2 to 0.5.3. - [Release notes](https://github.com/marksweb/django-bleach/releases) - [Changelog](https://github.com/marksweb/django-bleach/blob/master/CHANGELOG.md) - [Commits](https://github.com/marksweb/django-bleach/compare/0.5.2...0.5.3) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-04-19 19:53:07 +00:00
Víðir Valberg Guðmundsson	1083c2e514	Merge pull request #311 from bornhack/dependabot/pip/src/requirements/pytz-2019.1 ... Bump pytz from 2018.9 to 2019.1 in /src/requirements	2019-04-19 21:51:42 +02:00
dependabot[bot]	760fa7278e	Bump defusedxml from 0.5.0 to 0.6.0 in /src/requirements ... Bumps [defusedxml](https://github.com/tiran/defusedxml) from 0.5.0 to 0.6.0. - [Release notes](https://github.com/tiran/defusedxml/releases) - [Changelog](https://github.com/tiran/defusedxml/blob/master/CHANGES.txt) - [Commits](https://github.com/tiran/defusedxml/compare/v0.5.0...v0.6.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-04-18 06:47:25 +00:00
dependabot[bot]	7c5040d4b6	Bump pytz from 2018.9 to 2019.1 in /src/requirements ... Bumps [pytz](https://github.com/stub42/pytz) from 2018.9 to 2019.1. - [Release notes](https://github.com/stub42/pytz/releases) - [Commits](https://github.com/stub42/pytz/commits) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-04-10 06:55:10 +00:00
Thomas Flummer	ba54d9f61f	Corrected logo size (#309)	2019-04-07 18:31:31 +02:00
Thomas Flummer	5be6d74f4f	Added missing sponsor logo (#308) ... lgtm	2019-04-07 18:04:35 +02:00
Thomas Steen Rasmussen	d65b57e651	set invoice_date and creditor for expenses for reimbursements	2019-04-07 17:28:56 +02:00
Thomas Steen Rasmussen	a989579f1e	add missing import	2019-04-07 16:34:41 +02:00
Víðir Valberg Guðmundsson	75c8db4577	Get rid of wrapt hack. Django 2.2 introduced setup() method on views. Yay!	2019-04-02 12:32:12 +02:00
Víðir Valberg Guðmundsson	63890131c8	Merge pull request #304 from bornhack/dependabot/pip/src/requirements/pillow-6.0.0 ... Bump pillow from 5.4.1 to 6.0.0 in /src/requirements	2019-04-02 09:19:13 +02:00
dependabot[bot]	006d32b0ed	Bump django from 2.1.7 to 2.2 in /src/requirements ... Bumps [django](https://github.com/django/django) from 2.1.7 to 2.2. - [Release notes](https://github.com/django/django/releases) - [Commits](https://github.com/django/django/compare/2.1.7...2.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-04-02 06:18:34 +00:00
dependabot[bot]	57d915f321	Bump pillow from 5.4.1 to 6.0.0 in /src/requirements ... Bumps [pillow](https://github.com/python-pillow/Pillow) from 5.4.1 to 6.0.0. - [Release notes](https://github.com/python-pillow/Pillow/releases) - [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst) - [Commits](https://github.com/python-pillow/Pillow/compare/5.4.1...6.0.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-04-02 06:18:05 +00:00
Víðir Valberg Guðmundsson	1782c6c52d	Also 2017 is in the past	2019-04-01 10:39:37 +02:00
Víðir Valberg Guðmundsson	49bbf5d4b2	Change "will be" to "was" for 2019	2019-04-01 10:38:15 +02:00
Víðir Valberg Guðmundsson	af96dd7e28	Update logo for 2021.	2019-03-30 15:38:27 +01:00
Thomas Steen Rasmussen	77a2f43bc0	add 2021 generic logo	2019-03-30 15:24:26 +01:00
Thomas Steen Rasmussen	93255a4215	add 2021 template	2019-03-30 15:08:42 +01:00
Thomas Steen Rasmussen	0f5814b5ae	these templates are not used anymore, no need to create them in the createcamp management command	2019-03-30 15:07:40 +01:00
Thomas Steen Rasmussen	e6f5accaa6	add currency, show 0 DKK instead of None, enable jquery datatables for chain table in backoffice	2019-03-30 11:16:24 +01:00
Thomas Steen Rasmussen	30a687181e	change backoffice chain list to a table	2019-03-30 11:12:02 +01:00
Thomas Steen Rasmussen	78e68a2299	make the important text bold	2019-03-30 11:01:49 +01:00
Thomas Steen Rasmussen	a11cb38471	set creditor and debtor to null=False	2019-03-30 10:45:36 +01:00
Thomas Steen Rasmussen	ad256b0df4	add admin links to expense and revenue list and detail templates. Do we have a nicer way of linking to stuff in the admin?	2019-03-30 07:21:11 +01:00
Thomas Steen Rasmussen	3e79567713	add chain&credebtor views to backoffice	2019-03-30 06:54:45 +01:00
Víðir Valberg Guðmundsson	132d65087f	Merge pull request #296 from bornhack/handle_negative_stock ... Fix #263	2019-03-29 22:24:00 +01:00
Víðir Valberg Guðmundsson	e78013c87c	Blackness.	2019-03-29 22:19:49 +01:00
Víðir Valberg Guðmundsson	4aad051c72	More tests - and some blackness.	2019-03-29 22:06:52 +01:00
Víðir Valberg Guðmundsson	e5e1443218	Running black.	2019-03-29 21:21:24 +01:00
Víðir Valberg Guðmundsson	c69bf46255	Adding more tests, finding more errors - again!	2019-03-29 20:58:35 +01:00
Víðir Valberg Guðmundsson	2ce2205bd3	Adding more tests, finding more errors.	2019-03-29 17:06:53 +01:00
Víðir Valberg Guðmundsson	9d97a7184a	Make sure we do not get an IntegrityError because we are trying to create a new user with the same username as already created by another factory.	2019-03-29 15:59:07 +01:00
Víðir Valberg Guðmundsson	95dcba3fc3	Actually test this - it returnet False because the form was unbound.	2019-03-29 15:37:08 +01:00
Víðir Valberg Guðmundsson	d65624e95b	Actually found and error by writing tests! Yay!	2019-03-29 15:21:55 +01:00
Víðir Valberg Guðmundsson	26c2e492c3	Optimize tests a bit.	2019-03-29 12:15:15 +01:00
Víðir Valberg Guðmundsson	e745c4097f	Actually use codecov.	2019-03-29 12:06:41 +01:00
Víðir Valberg Guðmundsson	32b4cdfbee	Adding test for ProductDetailView.	2019-03-29 11:49:04 +01:00
Víðir Valberg Guðmundsson	b04e7235d9	Adding a test for the OrderProductRelationForm.	2019-03-29 11:19:31 +01:00
dependabot[bot]	b0d4fa8c41	Bump sqlparse from 0.2.4 to 0.3.0 in /src/requirements ... Bumps [sqlparse](https://github.com/andialbrecht/sqlparse) from 0.2.4 to 0.3.0. - [Release notes](https://github.com/andialbrecht/sqlparse/releases) - [Changelog](https://github.com/andialbrecht/sqlparse/blob/master/CHANGELOG) - [Commits](https://github.com/andialbrecht/sqlparse/compare/0.2.4...0.3.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-03-28 19:51:12 +00:00
dependabot[bot]	6e5d684291	Bump ipython from 7.3.0 to 7.4.0 in /src/requirements ... Bumps [ipython](https://github.com/ipython/ipython) from 7.3.0 to 7.4.0. - [Release notes](https://github.com/ipython/ipython/releases) - [Commits](https://github.com/ipython/ipython/compare/7.3.0...7.4.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-03-28 13:37:13 +00:00
dependabot[bot]	5748af7de5	Bump oauthlib from 3.0.0 to 3.0.1 in /src/requirements ... Bumps [oauthlib](https://github.com/oauthlib/oauthlib) from 3.0.0 to 3.0.1. - [Release notes](https://github.com/oauthlib/oauthlib/releases) - [Changelog](https://github.com/oauthlib/oauthlib/blob/master/CHANGELOG.rst) - [Commits](https://github.com/oauthlib/oauthlib/compare/v3.0.0...v3.0.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-03-28 13:16:23 +00:00
Víðir Valberg Guðmundsson	965c29167d	Add coverage checks.	2019-03-28 10:48:07 +01:00
Thomas Steen Rasmussen	c432899346	allow blank slugs	2019-03-28 07:16:02 +01:00
Thomas Steen Rasmussen	f248a5e0ca	Add Chain/Creditor/Debtor support in economy app. Make the Creditor/Debtor FK nullable for now, until we've backfilled Creditors/Debtors on all existing Expenses and Revenues.	2019-03-28 07:04:53 +01:00
Víðir Valberg Guðmundsson	863e089c2b	Fix tests.	2019-03-27 23:45:08 +01:00
Víðir Valberg Guðmundsson	f708864d14	Bah.	2019-03-27 23:39:42 +01:00
Víðir Valberg Guðmundsson	ce4a744da6	No need for this.	2019-03-27 23:37:34 +01:00
Víðir Valberg Guðmundsson	4cbb25a537	Use OrderProductRelationForm to validate stock when adding a new product to order, also make it possible to update the quantity of a product on the product detail page if it is already in the current order.	2019-03-27 23:34:44 +01:00
Víðir Valberg Guðmundsson	59cde9163f	Use a modelformset for the order detail view to be able to validate stock on updates of quantities and payment of the order.	2019-03-27 22:53:23 +01:00
Víðir Valberg Guðmundsson	6a1103256a	Add missing migration from adding ordering to Token model.	2019-03-27 20:25:41 +01:00
Víðir Valberg Guðmundsson	101cb2db63	Check stock when incrementing orderproduct quantity.	2019-03-27 20:25:06 +01:00
Víðir Valberg Guðmundsson	8a5b2e5ed1	Add a worker to cancel old orders.	2019-03-27 13:49:46 +01:00
Víðir Valberg Guðmundsson	39383e0acb	Check for orders which are cancelled=False instead of those who are paid to avoid "overselling".	2019-03-27 12:57:50 +01:00
Víðir Valberg Guðmundsson	707eeb9190	Segment tokens by camps.	2019-03-27 12:33:14 +01:00
Víðir Valberg Guðmundsson	96978f4223	Add an extra warning about not being able to access account if losing 2fa device.	2019-03-27 09:56:41 +01:00
Víðir Valberg Guðmundsson	5db3b8bf23	Fix some minor visual things.	2019-03-27 09:51:48 +01:00
Víðir Valberg Guðmundsson	313ce98f8a	Missing migration from when we added the date format.	2019-03-27 09:36:42 +01:00
Víðir Valberg Guðmundsson	ebb08d1c4f	Differentiating between account and profile actually makes sense, @flummer convinced me.	2019-03-27 09:27:57 +01:00
Víðir Valberg Guðmundsson	f220d1d4b7	Rearrange and emphasize a bit.	2019-03-26 22:31:39 +01:00
Víðir Valberg Guðmundsson	4ae94cb4d5	Give backup tokens some love.	2019-03-26 22:29:26 +01:00
Víðir Valberg Guðmundsson	8674029c5c	I mean like really consistent.	2019-03-26 22:00:17 +01:00
Víðir Valberg Guðmundsson	241bc650b3	Be consistent about calling it profile and not account.	2019-03-26 21:58:15 +01:00
Víðir Valberg Guðmundsson	bda1d77275	Forgot about credit notes.	2019-03-26 21:39:44 +01:00
Víðir Valberg Guðmundsson	0b2075425e	Keep view code in the respective apps, implement the template in the profiles app.	2019-03-26 21:22:54 +01:00
Víðir Valberg Guðmundsson	50d40eb7df	Add token finds list as something the profiles app decides how to show.	2019-03-26 13:39:09 +01:00
Víðir Valberg Guðmundsson	b3a7825b56	Some adjustments,	2019-03-26 13:24:23 +01:00
Víðir Valberg Guðmundsson	8c4d99d9e8	Big big overhaul.	2019-03-26 12:14:54 +01:00
Víðir Valberg Guðmundsson	8025303b57	Profile page makeover, initial stuff.	2019-03-26 10:22:27 +01:00
Víðir Valberg Guðmundsson	9f49610013	Fixing urls.	2019-03-26 09:53:06 +01:00
Víðir Valberg Guðmundsson	563bd8a59d	Merge branch 'master' into 2-factor-auth	2019-03-26 09:46:04 +01:00
Víðir Valberg Guðmundsson	b6052ca89a	Make start and end nonnull.	2019-03-18 23:54:06 +01:00
Víðir Valberg Guðmundsson	8143e9608c	Forgot that there is a timestamp method now.	2019-03-18 23:49:51 +01:00
Víðir Valberg Guðmundsson	6ef26243f6	Add start and end to instances and return them as posix.	2019-03-18 23:38:22 +01:00
Víðir Valberg Guðmundsson	0f11a77a92	Add urls to graphql schema.	2019-03-18 22:11:33 +01:00
Víðir Valberg Guðmundsson	6d151b5519	Do commonmark and linkifying the same way with trusted as with untrusted.	2019-03-18 21:39:05 +01:00
Víðir Valberg Guðmundsson	eb07af9c39	Add a note about the format for invoice dates for expenses and revnues. Fix #292.	2019-03-18 13:06:34 +01:00
Víðir Valberg Guðmundsson	0611da1645	For some reason pip on our webhost can not find channels-redis 2.3.3, so keeping it at 2.3.2.	2019-03-18 12:11:57 +01:00
Víðir Valberg Guðmundsson	60f2712063	Upgrade a lot of dependencies for good measure.	2019-03-18 11:42:31 +01:00
Víðir Valberg Guðmundsson	31c1f97036	Add event metadata information to non-js event pages. Fix #275.	2019-03-18 10:29:57 +01:00
Víðir Valberg Guðmundsson	8fb9e60601	Add a safety valve for creating tickets when marking an order as paid. Fix #136	2019-03-17 16:28:01 +01:00
Víðir Valberg Guðmundsson	512be60da5	Products can not be handed out if order is not paid. Fix #284.	2019-03-17 15:31:15 +01:00
Thomas Steen Rasmussen	a5e67fcb8c	remove extra mark_as_cancelled method	2019-03-17 15:21:03 +01:00
Víðir Valberg Guðmundsson	ecfe7dc385	Now markdown urls also work.	2019-03-17 15:09:32 +01:00
Thomas Steen Rasmussen	481a7d1a95	add mass order cancel adminaction	2019-03-17 15:04:28 +01:00
Víðir Valberg Guðmundsson	53adb50baf	Remove urlize filter from news items, we already have linkified in the commonmark filter.	2019-03-17 14:49:52 +01:00
Víðir Valberg Guðmundsson	e3ff8d876e	Enable CORS headers for /api/ endpoint. Also upgrade django to 2.1.7.	2019-03-14 12:57:27 +01:00
Víðir Valberg Guðmundsson	222cb74622	Make edit button blue.	2019-03-12 12:12:01 +01:00
Víðir Valberg Guðmundsson	9ff88281da	Change team guide template a bit.	2019-03-12 11:29:37 +01:00
Víðir Valberg Guðmundsson	6b5f610d49	Fixed buttons a bit.	2019-03-12 11:18:50 +01:00
Víðir Valberg Guðmundsson	0a3c71337e	Merging benjaomings work on team guides.	2019-03-12 11:13:13 +01:00
Víðir Valberg Guðmundsson	c51771be6b	Merge remote-tracking branch 'origin' into feature/team-guides	2019-03-12 10:58:29 +01:00
Víðir Valberg Guðmundsson	8b45c4629d	Add a link to RSS feed.	2019-03-12 10:27:09 +01:00
Víðir Valberg Guðmundsson	92a5f67ae3	Add RSS feed to news.	2019-03-12 10:13:27 +01:00
Víðir Valberg Guðmundsson	ed311fe2aa	Fix creating an info item for a team. Camp is on team, not info category.	2019-03-12 09:56:27 +01:00
Víðir Valberg Guðmundsson	0f18b5de5c	csrf_exempt the api.	2019-03-11 21:27:33 +01:00
Víðir Valberg Guðmundsson	d972ef2cef	Initial graphql endpoint. Only the program for now.	2019-03-11 20:26:36 +01:00
Víðir Valberg Guðmundsson	0b6cc60bb8	Add duration and notes to event proposal info.	2019-03-10 17:20:08 +01:00
Víðir Valberg Guðmundsson	87a1361172	Fix commonmark template filter to turn urls and emails into clickables.	2019-03-09 15:44:45 +01:00
Thomas Steen Rasmussen	3a84dd62d2	use bleach.linkify to make links in markdown clickable automagically, fixes #64	2019-02-17 17:39:42 +01:00
Thomas Steen Rasmussen	8c9b2d11bf	fix expenseadmin	2019-02-10 16:33:05 +01:00
Thomas Steen Rasmussen	ad0368f486	make it possible to filter products by category and ticket type, and remove description from product list	2019-02-10 14:53:01 +01:00
Thomas Steen Rasmussen	58d670b57f	get websocket scheme from window.location.protocol	2019-01-22 09:01:53 +01:00
Thomas Steen Rasmussen	d38453c745	CommonMark -> commonmark rename	2019-01-22 08:57:24 +01:00
Thomas Steen Rasmussen	050540c355	upgrade all pip packages to latest versions	2019-01-21 23:37:55 +01:00
Thomas Steen Rasmussen	3ca3631136	upgrade django, hax	2019-01-21 23:22:30 +01:00
Thomas Steen Rasmussen	58f3035927	switch from ws:// to wss://	2019-01-21 20:06:52 +01:00
Thomas Steen Rasmussen	b8fb36d346	add reimbursement_user to description of expense	2019-01-20 17:15:33 +01:00
Thomas Steen Rasmussen	c93b38a98b	make invoice_date a datefield not a datetimefield	2019-01-20 16:42:50 +01:00
Thomas Steen Rasmussen	d14708bee1	add invoice_date to django admin list display	2019-01-20 15:58:10 +01:00
Thomas Steen Rasmussen	51f8854a6c	show user on expense and revenue list and detail views	2019-01-20 15:50:54 +01:00
Thomas Steen Rasmussen	864a7e6673	add invoice_date to revenue and expense forms and templates	2019-01-20 15:39:59 +01:00
Thomas Steen Rasmussen	e8edb24233	add invoice_date field to Expense and Revenue models	2019-01-20 15:33:05 +01:00
Thomas Steen Rasmussen	29c468ab4a	show 2018 and 2019 in the camp menu dropdown	2019-01-20 09:47:47 +01:00
Thomas Steen Rasmussen	090a3b1e28	show both users on reimbursements	2019-01-20 09:38:18 +01:00
Thomas Steen Rasmussen	b4698f3fdc	fix case sensitive irc channel uniqueness check	2019-01-19 14:22:30 +01:00
Thomas Steen Rasmussen	1b9566ee02	make channel uniqueness check case insensitive	2019-01-19 13:49:51 +01:00
Thomas Steen Rasmussen	acfe658ab6	update location on frontpage	2019-01-13 17:21:57 +01:00
Thomas Steen Rasmussen	5e95133267	update help_text on a reimbursement field, and count reimbursement total with the right user field	2018-11-20 18:36:06 +01:00
Thomas Steen Rasmussen	733731ecf9	take camp into account when showing economy stats	2018-11-20 18:14:16 +01:00
Thomas Steen Rasmussen	fd1850dd98	use psycopg2-binary and close #271	2018-11-20 17:24:19 +01:00
Thomas Steen Rasmussen	a057bd6464	Revenue and economy revamp (#285) ... * rework economy stuff, add revenue model, unfinished code! * part 2 of economy overhaul. add views for dealing with revenue. rework expense views.	2018-11-20 17:12:32 +01:00
Thomas Steen Rasmussen	a8051783cb	upgrade requests due to vulnerability	2018-11-20 17:11:50 +01:00
Thomas Steen Rasmussen	9f28435256	upgrade django	2018-11-20 01:09:27 +01:00
Víðir Valberg Guðmundsson	0a81a88e93	Introduce wrapt and monkeypatch django.views.View so we have a setup method to override. (#279)	2018-11-20 00:22:43 +01:00
Thomas Flummer	9b2640ea07	changed sponsor logo to be filename only (#280) ... * changed sponsor logo to be filename only fixes issue #151 * changed to load logo correctly on sponsor tickets related to fix of issue #151	2018-11-20 00:20:37 +01:00
Thomas Flummer	95cd376f36	added danish bank transfer info (#281) ... fixes issue #237	2018-11-20 00:19:32 +01:00
Thomas Flummer	aafe9de44e	added a bit more margin in the botton to prevent footer from covering stuff on mobile devices (#282) ... fixes issue #228	2018-11-20 00:18:14 +01:00
Thomas Steen Rasmussen	16a838a3cf	upgrade django	2018-10-03 23:41:18 +02:00
Thomas Steen Rasmussen	348c73323d	make sure expense attachments open in a new window	2018-09-16 11:23:32 +02:00
Thomas Steen Rasmussen	794e905050	show both user and reimbursement_user for reimbursements	2018-09-13 14:09:17 +02:00
Thomas Steen Rasmussen	ffe2fc056a	show the correct name when creating reimbursement	2018-09-13 13:53:49 +02:00
Thomas Steen Rasmussen	3bd821373f	make CampRedirectView handle cases where there is no next or no previous camp with a bit more grace	2018-09-13 13:42:31 +02:00
Thomas Steen Rasmussen	1cd0551d5e	the amount of an expense can NOT be negative	2018-09-01 10:25:45 +02:00
Thomas Steen Rasmussen	4123c2eb91	clarify that expense amount can be negative	2018-09-01 09:56:22 +02:00
Víðir Valberg Guðmundsson	4c124a978d	Upgrade django to newest bugfix version ... https://docs.djangoproject.com/en/2.1/releases/2.1.1/	2018-08-31 11:41:49 +02:00
Thomas Steen Rasmussen	ac54e4cb16	show unapproved expenses seperately in backoffice, crosslink expenses and reimbursements in list and detailviews on main page and in backoffice	2018-08-30 19:32:23 +02:00
Thomas Steen Rasmussen	698beaaffd	refactor email functionality into seperate functions in economy.email module	2018-08-30 17:54:31 +02:00
Thomas Steen Rasmussen	8d32170422	derive mimetype from attachment content rather than hardcoding application/pdf as we've done until now (we have non-pdf attachments going to economic now)	2018-08-30 17:32:24 +02:00
Thomas Steen Rasmussen	435f95b70b	only use base filename, not full path lol	2018-08-30 17:31:43 +02:00
Thomas Steen Rasmussen	b753d05b5c	include expense uuid in subject of email to economic	2018-08-30 15:22:23 +02:00
Thomas Steen Rasmussen	fca7bd3721	filter on reimbursement_user not user	2018-08-30 13:24:23 +02:00
Thomas Steen Rasmussen	b56b9c27b4	include the actual attachment when sending to e-conomic	2018-08-30 13:17:52 +02:00
Thomas Steen Rasmussen	db73051a23	enable admin for Reimbursement model	2018-08-30 13:17:34 +02:00
Thomas Steen Rasmussen	fc3a993547	do not show the expense which represents the actual reimbursement, and do not count it towards the total	2018-08-30 12:39:43 +02:00
Thomas Steen Rasmussen	93b0bff50b	permit PDF as well as images for invoice uploads for expenses	2018-08-30 12:18:56 +02:00
Thomas Steen Rasmussen	ed736938cc	small markup fix	2018-08-30 01:42:45 +02:00
Thomas Steen Rasmussen	4d6a69d50a	remove stray pk_url_kwarg	2018-08-30 01:40:39 +02:00
Thomas Steen Rasmussen	8b3e00d9d4	make it impossible for users to approve expenses they submitted themselves	2018-08-30 01:35:37 +02:00
Víðir Valberg Guðmundsson	b2fa1dc92c	WIP Reimbursement feature (#278) ... * Almost done, need the send to economic part. * Add a way to approve/reject an reimbursement and send mails accordingly. * finish work on custom invoice address * add textfield notes to Order for internal orga notes about the order * Almost done, need the send to economic part. * Add a way to approve/reject an reimbursement and send mails accordingly. * economy commit of doom.. replace reimbursement app with an economy app, add Expense and Reimbursement models, add management of expenses and reimbursements to backoffice. Rework and cleanup permissions stuff, add Camp.Permissions pseudo model to hold all our non-model permissions. still experimental, expect rough edges, but basic functionality should work.	2018-08-30 00:52:32 +02:00