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

2078 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Víðir Valberg Guðmundsson a04fe67b69
Merge pull request #418 from bornhack/dependabot/pip/src/requirements/django-bootstrap3-12.0.3 
Bump django-bootstrap3 from 12.0.1 to 12.0.3 in /src/requirements
 2019-12-25 19:46: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 0264829170 Drop python 3.5 2019-12-25 19:30:54 +01: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 3e4cb37c0d Merge branch 'master' of github.com:bornhack/bornhack-website 2019-08-13 17:56:26 +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
Víðir Valberg Guðmundsson c6bf69730c It's an old code, sir, but it checks out. 2019-08-13 17:53:30 +02:00
Víðir Valberg Guðmundsson 1b56280b12
Merge pull request #380 from reynir/team-shift-member-name 
Team shifts: display public credit name as well
 2019-08-12 13:49:33 +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
Víðir Valberg Guðmundsson 66c2224806
Merge pull request #378 from flokli/shopticket-backoffice-quantity 
Show Quantity of ShopTickets in backoffice
 2019-08-09 10:19:26 +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