1640 commits

Author	SHA1	Message	Date
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
Thomas Steen Rasmussen	2c1e5f12fe	add textfield notes to Order for internal orga notes about the order	2018-08-27 12:44:53 +02:00
Thomas Steen Rasmussen	f396708156	finish work on custom invoice address	2018-08-27 11:52:42 +02:00
Víðir Valberg Guðmundsson	80e9c01f87	Merge pull request #277 from pwelzel/feature_custom_invoice_address ... add custom address field to shop.models.Order and invoice template	2018-08-22 19:27:23 +02:00
Patrick Welzel	8b8191e16d	add custom address field to shop.models.Order and invoice template	2018-08-22 15:41:24 +02:00
Thomas Steen Rasmussen	af794e6a2f	fix dates for 2019	2018-08-22 14:32:10 +02:00
Víðir Valberg Guðmundsson	f7d17883be	Display feedback a bit better.	2018-08-22 12:59:53 +02:00
Víðir Valberg Guðmundsson	09e916571e	Use the existing event type if there is one and one is not defined.	2018-08-21 13:47:56 +02:00
Víðir Valberg Guðmundsson	f2b7ad63ca	Ooops.	2018-08-20 15:57:00 +02:00
Víðir Valberg Guðmundsson	98433be365	Should be a CampRelatedModel.	2018-08-20 15:52:11 +02:00
Víðir Valberg Guðmundsson	0aa198ba6c	Save it!	2018-08-20 15:39:08 +02:00
Víðir Valberg Guðmundsson	2d58695ee4	Adding feedback functionality.	2018-08-20 15:13:51 +02:00
Víðir Valberg Guðmundsson	d605abcb40	Use col-xs- instead of col-sm- to get a slightly better dayview.	2018-08-20 12:43:33 +02:00
Víðir Valberg Guðmundsson	2ef3c45bc1	Fix bootstrap script.	2018-08-19 19:52:00 +02:00
Víðir Valberg Guðmundsson	b871613d24	Fix proposal submission.	2018-08-19 19:52:00 +02:00
Thomas Steen Rasmussen	52d3e827c8	show a message when all tokens have been found	2018-08-19 18:53:40 +02:00
Thomas Steen Rasmussen	387e4c1d87	filter on the correct id	2018-08-19 18:48:48 +02:00
Thomas Steen Rasmussen	a6e12868b3	fix order of columns	2018-08-19 18:35:40 +02:00
Thomas Steen Rasmussen	f408b0955a	add missing <tr> tags	2018-08-19 18:33:31 +02:00
Thomas Steen Rasmussen	fe4fdd06b0	show missing tokens, and show category/hint	2018-08-19 18:30:25 +02:00
Thomas Steen Rasmussen	df34d3edf3	add category field, and add unique_together constraint to TokenFind model until I figure out why it is creating duplicates	2018-08-19 17:56:04 +02:00
Víðir Valberg Guðmundsson	97ba725ba2	Add missing migrations.	2018-08-19 17:40:33 +02:00
Thomas Steen Rasmussen	62d172f6c2	add secret token to base.html	2018-08-19 16:22:02 +02:00
Víðir Valberg Guðmundsson	014e962a3f	use .get because it might not be there.	2018-08-19 00:06:25 +02:00
Víðir Valberg Guðmundsson	b50f368dea	Add a slides field to talk and lightning talk forms.	2018-08-18 20:43:24 +02:00
Víðir Valberg Guðmundsson	c8f6f76689	Make email mandatory and show that on the event proposal admin site.	2018-08-18 20:04:15 +02:00
Víðir Valberg Guðmundsson	428cee3cd7	Making event proposal admin slightly better.	2018-08-18 20:04:15 +02:00
Thomas Steen Rasmussen	7dd52c78ee	make the colours more visible on the camp list page, set camp colours in bootstrap script, add a light_text property to Camp model	2018-08-18 17:45:33 +02:00
Víðir Valberg Guðmundsson	84fff61ddb	Forgot something.	2018-08-18 16:55:33 +02:00
Víðir Valberg Guðmundsson	f15f878508	Add a proposal edit permission.	2018-08-18 16:37:20 +02:00
Benjamin Bach	2673cd86e2	Add a development default settings file and modify instructions	2018-08-18 16:02:35 +02:00
Thomas Steen Rasmussen	016bfdc1a1	add secret token game code	2018-08-18 15:26:49 +02:00
Benjamin Bach	0b3d8dafb8	Update psycopg2 to latest version	2018-08-18 15:06:27 +02:00
Víðir Valberg Guðmundsson	1af78e6ff7	Add email to SpeakerProposal and Speaker models.	2018-08-18 14:11:30 +02:00
Víðir Valberg Guðmundsson	83fa993ed1	Show SpeakerProposal email.	2018-08-18 13:36:11 +02:00
Víðir Valberg Guðmundsson	b3ef1d7538	Add the ticket to the order admin.	2018-08-17 11:59:28 +02:00
Víðir Valberg Guðmundsson	932d6aaa90	Show only camp bar products.	2018-08-16 18:27:59 +02:00
Víðir Valberg Guðmundsson	ff6912fed8	Spice up event instance admin.	2018-08-16 18:25:33 +02:00
Víðir Valberg Guðmundsson	104968ed32	Nor email.	2018-08-16 14:55:29 +02:00
Víðir Valberg Guðmundsson	e7fd3d9986	Sponsor ticket has no name.	2018-08-16 14:53:58 +02:00
Víðir Valberg Guðmundsson	9fd5dc27bf	User should be superuser to access complete backoffice.	2018-08-15 23:47:25 +02:00
Víðir Valberg Guðmundsson	ccfb3d13d0	Fix access to backoffice with infodesk permissions.	2018-08-15 20:53:54 +02:00
Víðir Valberg Guðmundsson	c02a80553f	Actually use the boolean flag.	2018-08-15 11:48:24 +02:00
Víðir Valberg Guðmundsson	93d6525b29	Add missing non-db migrations.	2018-08-15 11:31:00 +02:00
Víðir Valberg Guðmundsson	47bf0fcdbf	Add a command to generate sponsor tickets.	2018-08-15 11:30:42 +02:00
Víðir Valberg Guðmundsson	32f4ae13e3	Add some more ordering to TeamTask.	2018-08-15 00:17:03 +02:00
Víðir Valberg Guðmundsson	fc3cc91ad4	Update 2019 logo with new dates.	2018-08-14 21:06:49 +02:00
Víðir Valberg Guðmundsson	d9b7668ea8	Comments on tasks.	2018-08-14 20:13:46 +02:00
Víðir Valberg Guðmundsson	3d5645a10e	Dumb error.	2018-08-13 19:06:30 +02:00
Víðir Valberg Guðmundsson	bd00ae3424	Fix menu in mobile.	2018-08-13 19:00:40 +02:00
Víðir Valberg Guðmundsson	231f1e54fa	Woops, need to use lazy.	2018-08-13 18:59:49 +02:00
Víðir Valberg Guðmundsson	44f4f97101	Add success url to rideshare delete.	2018-08-13 18:56:48 +02:00
Víðir Valberg Guðmundsson	5bd0f38249	Revert to using TZ anyway. Too many problems by disabling it by now.	2018-08-13 18:55:25 +02:00
Víðir Valberg Guðmundsson	d7e8e24361	Correct typo.	2018-08-12 22:51:41 +02:00
Víðir Valberg Guðmundsson	da639ff4cd	Add shortcut to users teams. Add a overview of users shifts, and prevent user from taking a shift which overlaps with one already assigned to the user.	2018-08-12 16:50:53 +02:00
Víðir Valberg Guðmundsson	a3bfd85604	Disable timezone support. Everything is in Europe/Copenhagen anyway.	2018-08-11 18:15:19 +02:00
Víðir Valberg Guðmundsson	084782b22d	Add channels_redis requirement.	2018-08-10 22:36:28 +02:00
Víðir Valberg Guðmundsson	630b2e55de	Re-add CHANNEL_LAYERS settings.	2018-08-10 22:25:50 +02:00
Víðir Valberg Guðmundsson	e21f596188	Add a help text to rideshare when field to show format for now.	2018-08-10 19:29:19 +02:00
Víðir Valberg Guðmundsson	426a3f56be	Merge pull request #260 from bornhack/feature/rideshare ... Ridesharing functionality	2018-08-10 18:47:56 +02:00
Víðir Valberg Guðmundsson	b864a2cd56	Adding str representation anyway.	2018-08-10 18:46:54 +02:00
Víðir Valberg Guðmundsson	effe016b57	Ensure only the creator of the ride can edit and delete it.	2018-08-10 18:46:35 +02:00
Víðir Valberg Guðmundsson	d6321cf5e8	Use list_display instead.	2018-08-10 18:39:21 +02:00
Víðir Valberg Guðmundsson	c83ebfed08	Adding admin for rideshare.Ride	2018-08-10 18:37:34 +02:00
Víðir Valberg Guðmundsson	641f4dfc73	Upgrading various dependencies.	2018-08-10 18:02:16 +02:00
Víðir Valberg Guðmundsson	3229838d0a	Adding contact options.	2018-08-10 17:41:19 +02:00
Víðir Valberg Guðmundsson	56875732dd	Also show location on non-js event detail page.	2018-08-10 16:26:25 +02:00
Víðir Valberg Guðmundsson	5ae96cfa6d	Add location to events on schedule.	2018-08-10 16:22:17 +02:00
Víðir Valberg Guðmundsson	72f6d42ee2	Show description for team member for team responsible.	2018-08-10 10:14:03 +02:00
Víðir Valberg Guðmundsson	4043b609fd	Model should have a default of false, so things that are not defined as true will default to false.	2018-08-09 15:35:58 +02:00
Víðir Valberg Guðmundsson	0e3e6ae06f	Remove "this".	2018-08-09 15:30:24 +02:00
Víðir Valberg Guðmundsson	f2c5c26262	Fix video recording field and help text.	2018-08-09 15:28:46 +02:00
Víðir Valberg Guðmundsson	6aa37716d6	Fleshing out some templates.	2018-08-09 14:36:21 +02:00
Víðir Valberg Guðmundsson	6b0bc8b737	Add non-db migration which was forgotten.	2018-08-08 22:36:54 +02:00
Víðir Valberg Guðmundsson	1c8685d15e	Initial work on rideshare feature.	2018-08-08 22:19:28 +02:00
Víðir Valberg Guðmundsson	badd18cb1b	Fix apparently intentional off by one error when creating multiple shifts.	2018-08-08 14:41:20 +02:00
Víðir Valberg Guðmundsson	8076f0c380	Use assign/unassign on button.	2018-08-08 14:37:41 +02:00
Víðir Valberg Guðmundsson	ca33f8c5eb	Make it possible to drop a shift.	2018-08-08 14:36:31 +02:00
Víðir Valberg Guðmundsson	25f40b381b	Fix filter in link to schedule from event list.	2018-08-06 21:11:39 +02:00
Víðir Valberg Guðmundsson	2ac86d661c	Forgot a spot.	2018-08-06 10:17:22 +02:00
Víðir Valberg Guðmundsson	88152776e3	Include buildup and teardown in available shifts days.	2018-08-05 18:48:58 +02:00
Víðir Valberg Guðmundsson	86ed7a82e8	Forgot to mark shift views as shift views so the menu pick it up	2018-08-05 18:36:57 +02:00
Víðir Valberg Guðmundsson	db5a2e1d92	Hide shifts for non-members.	2018-08-05 18:31:43 +02:00
Víðir Valberg Guðmundsson	a33e932858	Small representation fix.	2018-08-05 18:21:30 +02:00
Víðir Valberg Guðmundsson	6593d16966	Merge branch 'master' into feature/shift_planning	2018-08-05 17:46:45 +02:00
Víðir Valberg Guðmundsson	e482b63c14	Fixing video icon and using another icon for non-recording.	2018-08-05 12:42:18 +02:00
Víðir Valberg Guðmundsson	fe974e469b	Show email for users when user is team responsible.	2018-08-05 12:23:33 +02:00
Víðir Valberg Guðmundsson	214026dfd7	Integrate into new teams structure.	2018-08-05 12:18:10 +02:00
Víðir Valberg Guðmundsson	f5b80d9ac7	Merge branch 'master' into feature/shift_planning	2018-08-05 11:26:15 +02:00
Víðir Valberg Guðmundsson	2ad0568f64	Merge pull request #257 from bornhack/feature/team_refactor ... Team site refactor	2018-08-05 11:18:03 +02:00
Thomas Steen Rasmussen	458ce45198	add village gear sections to backoffice	2018-08-05 09:29:58 +02:00
Víðir Valberg Guðmundsson	14c88cc9e4	Update the compiled version of the scedule.	2018-08-05 00:22:16 +02:00
Víðir Valberg Guðmundsson	d6a2151cdf	Rename placeholder for DateTimeRangeField - it is not the most elegant API to work with.	2018-08-05 00:18:51 +02:00
Víðir Valberg Guðmundsson	ddd2d5d5dd	Forgot this for previous commit.	2018-08-04 18:24:13 +02:00
Víðir Valberg Guðmundsson	df3751ecb8	Remove include since we have everything for tasks in one place now.	2018-08-04 18:13:51 +02:00
Víðir Valberg Guðmundsson	a4060c2815	Merge branch 'master' into feature/team_refactor	2018-08-04 18:11:32 +02:00
Thomas Steen Rasmussen	73ec701b06	add when and completed to teamtask model, move task list to an included file	2018-08-04 17:38:09 +02:00
Thomas Steen Rasmussen	eb8e548c3f	add Meetup eventtype in SpeakerProposalForm and EventProposalForm	2018-08-04 13:54:37 +02:00
Víðir Valberg Guðmundsson	da75660f0d	Final touches - I think.	2018-08-04 13:45:52 +02:00
Víðir Valberg Guðmundsson	d08c299e8d	Views can have an indirect relation to a team.	2018-08-04 13:27:05 +02:00
Víðir Valberg Guðmundsson	ef4262995f	Merge pull request #256 from fALKENdk/253-change-the-z-index-of-the-menu ... Changed z-index of .sticky	2018-08-04 13:12:51 +02:00
Thomas Steen Rasmussen	eeab018a77	add dansk metal sponsor logo	2018-08-02 09:48:59 +02:00
Kasper Friis Christensen	a2b0d2980a	Minimized comment size	2018-08-01 21:27:02 +02:00
Kasper Friis Christensen	456d9377a6	Changed z-index of .sticky and added bootstrap z-indexes to bornhack.css as a comment	2018-08-01 21:15:43 +02:00
Stephan Telling	d03af1c11e	use django.utils timezone rather than datetime	2018-08-01 12:25:43 +02:00
Stephan Telling	e04038e4a0	add backoffice pages for merchandise orders and what merchandise to order	2018-08-01 11:50:16 +02:00
Stephan Telling	e2ef635abc	overwrite get_queryset on ProductHandoutView and delete unused imports	2018-08-01 11:33:36 +02:00
Kasper Christensen	c8e65b739d	Update bornhack.css ... Made content under "Add to order" in shop items visible on iphone.	2018-07-31 13:43:39 +02:00
Víðir Valberg Guðmundsson	8f46897f0c	Add LetsGo logo.	2018-07-30 13:54:36 +02:00
Thomas Steen Rasmussen	b6a2ac07b1	crop pcbway logo a bit	2018-07-30 09:28:10 +02:00
Thomas Steen Rasmussen	6a62624355	add epson logo	2018-07-30 09:16:55 +02:00
Thomas Steen Rasmussen	ae14b759fa	add pcbway logo	2018-07-27 13:20:24 +02:00
Thomas Steen Rasmussen	6828807f2c	forgot to rename variable one place	2018-07-26 21:06:00 +02:00
Thomas Steen Rasmussen	9517fb25ea	pass request everywhere it is needed	2018-07-26 15:03:49 +02:00
Thomas Steen Rasmussen	016ac8adac	use hasattr() and clean up urls	2018-07-24 19:02:58 +02:00
Víðir Valberg Guðmundsson	02977acd5e	Some DRYing.	2018-07-23 23:12:57 +02:00
Víðir Valberg Guðmundsson	c68015fe26	Teams detail page was starting to get crowded. This is the start of a mostly visual, but also structural, refactor.	2018-07-22 23:18:50 +02:00
Thomas Steen Rasmussen	cf9e9ebd5a	remove debug print	2018-07-20 08:04:12 +02:00
Víðir Valberg Guðmundsson	2bdd172b92	Fix multiple shifts create. Add deletion. Add a way to take a shift.	2018-07-19 22:46:26 +02:00
Thomas Steen Rasmussen	11a94b477c	redirect to the events list if nothing is scheduled yet	2018-07-18 00:58:33 +02:00
Thomas Steen Rasmussen	d46ccc530b	handle empty results correctly in CampViewMixin, also add a text to the speaker list page when no speakers are found	2018-07-18 00:46:38 +02:00
Thomas Steen Rasmussen	025692d017	add icons to speaker list page	2018-07-18 00:15:14 +02:00
Thomas Steen Rasmussen	a6b0332c9f	small visual fixes, headline size and remove a stray </h4> and remove the text-container class from the speaker description markdown	2018-07-17 23:35:10 +02:00
Thomas Steen Rasmussen	00c053829e	fix copy paste error which makes urls not be shown on event detail page, and fix headline	2018-07-17 23:27:20 +02:00
Thomas Steen Rasmussen	340a3eb58c	only check for pk and slug when relevant	2018-07-17 22:47:14 +02:00
Thomas Steen Rasmussen	32e9b7c40b	Fix urls handling and other stuff (#249) ... * update font-awesome to 5.1 and add fab- and fa-regular icons, fixed #244 * also handle slugs when dealing with SingleObjectMixin CBV views, fixes #248 * add missing trailing slash to bar/menu * add missing trailing slash on event slugs, fixes #245 * fix a lot of stuff related to proposal URLs. actually display them on speaker and event detail pages. show the urltype icons. better messages on update and delete pages. fix 500 error when reapproving events. fix bug that made urls multiply when reapproving event. fixes #246 and fixes #247	2018-07-17 22:43:16 +02:00
Víðir Valberg Guðmundsson	b602e394fe	Fix CampViewMixin to deal properly with multiple camp_filters when dealing with SingleObjectMixin based CBVs	2018-07-17 20:46:30 +02:00
Víðir Valberg Guðmundsson	4f77b21a60	Add a way to create multiple shifts - needs a bit more work though.	2018-07-17 19:28:16 +02:00
Víðir Valberg Guðmundsson	8ac973bc61	Iterate over camo_filter and return the first one that returns results! (#243)	2018-07-16 16:07:38 +02:00
Víðir Valberg Guðmundsson	7f9dfdd6e1	Merge pull request #242 from graffen/saxologo ... Add Saxo Bank logo	2018-07-13 14:42:03 +02:00
Thomas Steen Rasmussen	d3ba04b6f2	fix coinify callbacks by passing request argument to order.mark_as_paid()	2018-07-13 14:38:01 +02:00
Jesper Hess	6737515ad4	Add Saxo Bank logo	2018-07-13 14:36:20 +02:00
Víðir Valberg Guðmundsson	c103400046	Enable editing of shifts. With timezone rabbit hole.	2018-07-03 07:15:42 +02:00
Víðir Valberg Guðmundsson	102dfa7330	Initial work on shift planning.	2018-07-02 23:52:52 +02:00
Víðir Valberg Guðmundsson	9bfdc714f0	Merge pull request #222 from bornhack/feature/team_controlled_info ... Make info categories team controlled	2018-07-01 17:34:22 +02:00
Thomas Steen Rasmussen	bf864cb5bd	also handle Slacking Off events in EventProposalForm	2018-06-26 23:37:39 +02:00
Thomas Steen Rasmussen	5493dbee47	change proposal status when the submitter adds or updates a URL	2018-06-26 23:37:20 +02:00
Thomas Steen Rasmussen	ea2bfc8498	hide action buttons when not on the proposal page	2018-06-26 23:31:56 +02:00
Víðir Valberg Guðmundsson	a42e23ebd5	Add slacking off to the if-elif-clause for creating a form for proposals.	2018-06-24 01:02:06 +02:00
Víðir Valberg Guðmundsson	5472dbb4b7	Fix village update view.	2018-06-24 00:41:58 +02:00
Thomas Steen Rasmussen	9bfc206b53	define model on all Village views, remove Villages custom manager	2018-06-21 12:32:02 +02:00
Víðir Valberg Guðmundsson	43f076262b	Fix some outstanding issues with the team controlled info categories functionality.	2018-06-21 09:19:09 +02:00
Víðir Valberg Guðmundsson	635e57b7f9	Merge branch 'master' into feature/team_controlled_info	2018-06-21 08:53:47 +02:00
Víðir Valberg Guðmundsson	4c60415336	Make each model which inherit from CampRelatedModel but doesn not have a direct relation, define a camp_filter. (#240)	2018-06-20 22:03:29 +02:00
Thomas Steen Rasmussen	b94e737e09	add new bornfiber sponsor logo	2018-06-19 19:24:46 +02:00
Thomas Steen Rasmussen	f5be4d68d1	info and shop should use the |trustedcommonmark filter	2018-06-04 08:28:09 +02:00
Thomas Steen Rasmussen	4ad58188b2	change the default for link icons, move import for speakerproposalmodel earlier in dode, and add mark_as_rejected() method on eventproposal model	2018-06-03 23:36:07 +02:00
Thomas Steen Rasmussen	23c42985ae	hide url action buttons when not inside the program app, and change urltype icons to include the 'fas' bit of the fontawesome class	2018-06-03 23:34:40 +02:00
Thomas Steen Rasmussen	2305416461	only show tables when at least one proposal is found	2018-06-03 23:24:50 +02:00
Thomas Steen Rasmussen	a7a9a24c6c	move debug logging so channel messages are not logged, the bot doesn't handle any channel messages anyway and we dont want the data	2018-06-03 22:39:05 +02:00
Thomas Steen Rasmussen	02a7af6303	Make content submission form stuff much nicer. More DRY and more nice. Use one class with a form __init__ kwargs which sets eventtype	2018-06-03 19:41:49 +02:00
Thomas Steen Rasmussen	3180ec457d	switch backoffice to use the regular CampViewMixin	2018-06-03 18:33:51 +02:00
Thomas Steen Rasmussen	9c9edff4f7	check for empty duration when cleaning duration field	2018-06-03 17:20:45 +02:00
Thomas Steen Rasmussen	3fb2f44e94	add eventtype icons to event list and event detail views in program	2018-06-03 17:16:35 +02:00
Thomas Steen Rasmussen	64f4eebac3	handle cached_property as well as regular properties in our camp filtering on @property in CampViewMixin	2018-06-03 17:16:00 +02:00
Thomas Steen Rasmussen	bff5bb292e	add debate as eventtype in bootstrap-devsite, and fix commonmark templatefilter a few places I missed	2018-06-03 16:29:28 +02:00
Thomas Steen Rasmussen	811b8171af	working on #232, this commit changes backoffice to be camp specific (although many of the actual functions are camp independent). Add backoffice/mixins.py with BackofficeViewMixin to keep it DRY. Add backoffice views to manage proposals. Move SpeakerProposal and EventProposal detail template to includes to they can be used from backoffice. Rename our commonmark templatetags so the names are more intuitive.	2018-06-03 15:34:04 +02:00
Thomas Steen Rasmussen	b34fe62118	small visual fixes, add a button to remove speakerproposal from eventproposal	2018-05-27 17:19:19 +02:00
Thomas Steen Rasmussen	2ba8d153fe	fix CFP url on bornhack 2020 frontpage	2018-05-27 16:31:57 +02:00
Thomas Steen Rasmussen	3d100c2f8a	hide buttons that modify stuff when CFP is not open or camp is readonly	2018-05-27 16:27:41 +02:00
Víðir Valberg Guðmundsson	183da3d161	Add tagline to small logo for 2018.	2018-05-26 20:22:10 +02:00
Víðir Valberg Guðmundsson	6226417ad7	Fix lookups that were forgotten.	2018-05-26 20:14:48 +02:00
Thomas Steen Rasmussen	8e7dc4f80a	move call for sponsors view to the database	2018-05-26 15:22:45 +02:00
Thomas Steen Rasmussen	7d9c730752	remove a couple of mixins that are not needed	2018-05-26 14:53:39 +02:00
Thomas Steen Rasmussen	53fa204455	Merge branch 'master' of github.com:bornhack/bornhack-website	2018-05-26 14:42:28 +02:00
Thomas Steen Rasmussen	9052526264	remove action buttons from proposal list, they can be found in the detail views, helps a lot with the width issues when things have long names	2018-05-26 10:48:38 +02:00
Thomas Steen Rasmussen	24371b629a	reenable mails to Content team when speaker/eventproposals are created/updated, change so proposal URLs are opened in new window, add a message in browser when proposals are approved in the admin	2018-05-26 10:24:52 +02:00
Thomas Steen Rasmussen	eb807a6853	move call for participation from template to the database, prepare to move call for sponsors in the same way. This commit means we will need to copy the content of the old templates to the prod db after deploy	2018-05-25 14:27:53 +02:00
Thomas Steen Rasmussen	157050d30e	make it possible to remove a speakerproposal from an eventproposal, move proposal delete buttons to the proposal detail pages, fix a button here and there	2018-05-24 11:43:46 +02:00
Thomas Steen Rasmussen	1f58471927	default allow_video_recording to checked	2018-05-24 10:23:42 +02:00
Thomas Steen Rasmussen	3e12c98b95	for some reason all our test users were is_staff=True users	2018-05-23 23:34:54 +02:00
Thomas Steen Rasmussen	18c33383b7	add url support for speakerproposals and eventproposals, including new models Url and UrlType. Also switch to Django 2.0 path() syntax in various urls.py files getting rid of a lot of ugly regex \o/	2018-05-23 23:28:27 +02:00
Víðir Valberg Guðmundsson	5b77cb5aa2	Implement a catchall for the remaining infocategories.	2018-05-20 22:27:41 +02:00
Víðir Valberg Guðmundsson	decfa29659	Remove obsolete check.	2018-05-20 22:25:19 +02:00
Víðir Valberg Guðmundsson	a8df8f0cee	Make team a mandatory field on infocategory.g	2018-05-20 22:11:39 +02:00
Víðir Valberg Guðmundsson	317a1c0b1c	Remove camp from infocategory and derive it from team.	2018-05-20 22:10:38 +02:00
Thomas Steen Rasmussen	df783168c6	filter speakerproposals by user, and redirect directly to combined submit view if no existing speakerproposals was found	2018-05-20 21:54:36 +02:00
Thomas Steen Rasmussen	1fb4eb7e28	remove help box with status explanations, no room :(	2018-05-20 21:42:11 +02:00
Thomas Steen Rasmussen	84c19d01c1	remove tooltip, add missing update button on speakerproposal detail page	2018-05-20 21:36:33 +02:00
Thomas Steen Rasmussen	4720b34021	link to detail view rather than update view in the tables, shine up the detail views a bit	2018-05-20 21:32:05 +02:00
Thomas Steen Rasmussen	743cf25476	add abstract field for music acts	2018-05-20 21:29:37 +02:00
Thomas Steen Rasmussen	5dc3e17d66	if one or more speakerproposals exist show a list so the user can pick an existing or choose to add a new; use the multimodelform stuff only when the user wants to add a new speakerproposal	2018-05-20 21:11:53 +02:00