Commit graph

2408 commits

Author SHA1 Message Date
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 37d40469c2
Merge pull request #371 from bornhack/add_speaker_laptop_boolean_field_to_lightning_talks
Adding "use_provided_speaker_laptop" to EventProposal.
2019-07-31 20:30:04 +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 ae56168ba4
Merge pull request #368 from bornhack/dependabot/pip/src/requirements/coverage-4.5.4
Bump coverage from 4.5.3 to 4.5.4 in /src/requirements
2019-07-30 22:53:39 +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
Thomas Flummer b49a2c1081 Added Siteimprove logo 2019-07-28 19:45:18 +02:00
Thomas Flummer ac0aff601e Added higer resolution sponsor logos
Better for higher DPI monitors
2019-07-28 17:21:23 +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
Thomas Steen Rasmussen 1d24878ece add lgandersen to contributors in README.md 2019-07-21 15:06:19 +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
Víðir Valberg Guðmundsson 8e7313e90f
Merge pull request #360 from bornhack/dependabot/pip/src/requirements/django-filter-2.2.0
Bump django-filter from 2.1.0 to 2.2.0 in /src/requirements
2019-07-17 08:55:47 +02:00