reynir/bornhack-website
1
0
Fork 0
Code Issues Pull requests 1 Releases Wiki Activity
1899 commits 2 branches 0 tags 164 MiB
Commit graph

1118 commits

Author SHA1 Message Date
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