Commit graph

Select branches

Hide pull requests

master

shift-selling

#1

Mono Color

• 8441620376
  Merge pull request #437 from bornhack/dependabot/pip/src/requirements/django-debug-toolbar-2.2 Víðir Valberg Guðmundsson 2020-02-11 06:56:31 +0100
• 270327fb2e
  Merge pull request #444 from bornhack/dependabot/pip/src/requirements/django-extensions-2.2.8 Víðir Valberg Guðmundsson 2020-02-11 06:56:01 +0100
• 9a48368c3a
  Bump django-extensions from 2.2.6 to 2.2.8 in /src/requirements dependabot-preview[bot] 2020-02-11 05:27:18 +0000
• e8cdae9be6 Merge pull request #443 from bornhack/dependabot/pip/src/requirements/graphene-django-2.8.1 Víðir Valberg Guðmundsson 2020-02-10 09:14:01 +0100
• 0399ffbe20 Bump graphene-django from 2.8.0 to 2.8.1 in /src/requirements dependabot-preview[bot] 2020-02-10 05:34:06 +0000
• 8b049da938 forgot to add pre-commit to requirements Thomas Steen Rasmussen 2020-02-07 18:53:33 +0100
• 701ffc71ad
  Bump django-debug-toolbar from 2.1 to 2.2 in /src/requirements dependabot-preview[bot] 2020-02-07 17:53:22 +0000
• 3d790c33cb add pre-commit config for auto black Thomas Steen Rasmussen 2020-02-07 18:51:50 +0100
• 377a77143c black everything, working on #355 Thomas Steen Rasmussen 2020-02-07 18:46:34 +0100
• 20f380dfd6
  Planked code form betterforms. (Aka django 3.0 upgrade) (#436) Víðir Valberg Guðmundsson 2020-02-07 18:21:34 +0100
• baf43f0e22
  Upgrade to django 2.2.9 Víðir Valberg Guðmundsson 2020-02-01 05:24:20 +0100
• 3bf3cf03af
  Merge pull request #434 from bornhack/dependabot/pip/src/requirements/ipython-7.12.0 Víðir Valberg Guðmundsson 2020-02-01 05:21:51 +0100
• 42752b38af
  Merge pull request #428 from bornhack/dependabot/pip/src/requirements/django-extensions-2.2.6 Víðir Valberg Guðmundsson 2020-02-01 05:21:29 +0100
• c20cfdb863
  Merge pull request #432 from bornhack/dependabot/pip/src/requirements/wheel-0.34.2 Víðir Valberg Guðmundsson 2020-02-01 05:20:57 +0100
• c9f302e170 django.contrib.staticfiles.templatetags.staticfiles.static is gone in django 3 Vidir Valberg Gudmundsson 2020-02-01 05:09:20 +0100
• 261cba6689
  Bump ipython from 7.10.2 to 7.12.0 in /src/requirements dependabot-preview[bot] 2020-02-01 04:02:55 +0000
• eec93dcb6d
  Bump django-extensions from 2.2.5 to 2.2.6 in /src/requirements dependabot-preview[bot] 2020-02-01 04:02:18 +0000
• 3f3f6ae909
  Merge pull request #429 from bornhack/dependabot/pip/src/requirements/irc3-1.1.5 Víðir Valberg Guðmundsson 2020-02-01 05:01:44 +0100
• 75005c97a8
  Merge pull request #426 from bornhack/dependabot/pip/src/requirements/django-cors-headers-3.2.1 Víðir Valberg Guðmundsson 2020-02-01 05:01:08 +0100
• ab2f7bc831 Python 2 is sooo last decade. Vidir Valberg Gudmundsson 2020-02-01 04:58:56 +0100
• 09e1a1fd36
  Merge pull request #421 from bornhack/dependabot/pip/src/requirements/graphene-django-2.8.0 Víðir Valberg Guðmundsson 2020-02-01 04:52:44 +0100
• 271f5e3ed9
  Bump django-cors-headers from 3.2.0 to 3.2.1 in /src/requirements dependabot-preview[bot] 2020-02-01 03:48:29 +0000
• 7b8e64be72
  Bump graphene-django from 2.4.0 to 2.8.0 in /src/requirements dependabot-preview[bot] 2020-02-01 03:48:28 +0000
• 52d57136e3
  Merge pull request #430 from bornhack/dependabot/pip/src/requirements/django-wkhtmltopdf-3.3.0 Víðir Valberg Guðmundsson 2020-02-01 04:47:17 +0100
• 718ed7dcda
  Merge pull request #433 from bornhack/2020logo Víðir Valberg Guðmundsson 2020-02-01 04:26:53 +0100
• 7e6dc6a675 New logos for 2020 and 2021, new favicon package Thomas Flummer 2020-02-01 00:42:19 +0100
• 087db0ea81 add new logo to website Thomas Steen Rasmussen 2020-01-31 18:55:21 +0100
• 77060e0945
  Bump wheel from 0.33.6 to 0.34.2 in /src/requirements dependabot-preview[bot] 2020-01-31 05:29:57 +0000
• c9ba9e365a
  Bump django-wkhtmltopdf from 3.2.0 to 3.3.0 in /src/requirements dependabot-preview[bot] 2020-01-20 05:36:00 +0000
• e7d81dc161
  Bump irc3 from 1.1.4 to 1.1.5 in /src/requirements dependabot-preview[bot] 2020-01-20 05:35:36 +0000
• a475e3d7d5
  Merge pull request #416 from bornhack/dependabot/pip/src/requirements/channels-2.4.0 Víðir Valberg Guðmundsson 2019-12-25 21:47:17 +0100
• a6aefed6d8
  Merge pull request #415 from bornhack/dependabot/pip/src/requirements/django-debug-toolbar-2.1 Víðir Valberg Guðmundsson 2019-12-25 21:38:02 +0100
• a04fe67b69
  Merge pull request #418 from bornhack/dependabot/pip/src/requirements/django-bootstrap3-12.0.3 Víðir Valberg Guðmundsson 2019-12-25 19:46:02 +0100
• 1185b29d87
  Bump channels from 2.3.1 to 2.4.0 in /src/requirements dependabot-preview[bot] 2019-12-25 18:44:26 +0000
• 28d6ede36e
  Bump django-debug-toolbar from 2.0 to 2.1 in /src/requirements dependabot-preview[bot] 2019-12-25 18:44:08 +0000
• d8db990d0f
  Bump django-bootstrap3 from 12.0.1 to 12.0.3 in /src/requirements dependabot-preview[bot] 2019-12-25 18:43:40 +0000
• 0264829170 Drop python 3.5 Vidir Valberg Gudmundsson 2019-12-25 19:30:54 +0100
• 6c9082c6d8 Fix 2fa setup. Vidir Valberg Gudmundsson 2019-12-25 19:01:12 +0100
• 8cda197114 Revert "This should work." Vidir Valberg Gudmundsson 2019-12-25 19:00:39 +0100
• c2b13c7b7d This should work. Vidir Valberg Gudmundsson 2019-12-17 14:03:03 +0100
• db19dbc858 graphene django does not support 3.0 yet Thomas Steen Rasmussen 2019-12-17 04:00:15 +0100
• 4e62af2082 update all the things Thomas Steen Rasmussen 2019-12-17 03:54:40 +0100
• 0cb7b688fa sort products by category weight on shop page Thomas Steen Rasmussen 2019-12-16 23:41:05 +0100
• 81fd6b30e5 remove token, remove 2018 from menu and add 2020 Thomas Steen Rasmussen 2019-09-07 15:17:46 +0200
• d5019d8082 fix dates on 2020 frontpage Thomas Steen Rasmussen 2019-09-07 15:13:51 +0200
• 9ee3fb396a Remove tickets available from 2019 camp detail. Víðir Valberg Guðmundsson 2019-08-17 22:36:54 +0200
• 1258a595b4 Sshhhhhhh... R5sjkjxiYx4QaiVXJHEszYCju7NJBior Víðir Valberg Guðmundsson 2019-08-13 18:12:45 +0200
• 3e4cb37c0d Merge branch 'master' of github.com:bornhack/bornhack-website Víðir Valberg Guðmundsson 2019-08-13 17:56:26 +0200
• 7e0c87957f It's an old code, sir, but it checks out. Víðir Valberg Guðmundsson 2019-08-13 17:53:13 +0200
• c6bf69730c It's an old code, sir, but it checks out. Víðir Valberg Guðmundsson 2019-08-13 17:53:13 +0200
• 1b56280b12
  Merge pull request #380 from reynir/team-shift-member-name Víðir Valberg Guðmundsson 2019-08-12 13:49:33 +0200
• f000eb0410 Team shifts: display public credit name Reynir Björnsson 2019-08-11 17:47:54 +0200
• 30e1049dbc Use the right comment. Víðir Valberg Guðmundsson 2019-08-11 15:59:02 +0200
• b5e1623cb7 Adding missing th Víðir Valberg Guðmundsson 2019-08-11 13:30:28 +0200
• 78ddb33fcb More to the shop ticket list. Víðir Valberg Guðmundsson 2019-08-11 13:26:11 +0200
• 814cbb4af5 Add a list over shop tickets. Víðir Valberg Guðmundsson 2019-08-11 13:18:19 +0200
• 4ad2a23158 Moving figcaption up again! Víðir Valberg Guðmundsson 2019-08-09 12:45:51 +0200
• adee7c58c4 Maybe this breaks the qr code? Víðir Valberg Guðmundsson 2019-08-09 12:11:37 +0200
• e2404b1778
  Merge pull request #372 from bornhack/dependabot/pip/src/requirements/pytz-2019.2 Víðir Valberg Guðmundsson 2019-08-09 10:26:27 +0200
• 8465190e75
  Merge pull request #374 from bornhack/dependabot/pip/src/requirements/oauthlib-3.1.0 Víðir Valberg Guðmundsson 2019-08-09 10:25:50 +0200
• db4ff33b87
  Merge pull request #376 from bornhack/sponsors Víðir Valberg Guðmundsson 2019-08-09 10:25:26 +0200
• 6f55bda732
  Merge pull request #379 from flokli/qrcode-caption Víðir Valberg Guðmundsson 2019-08-09 10:20:02 +0200
• 66c2224806
  Merge pull request #378 from flokli/shopticket-backoffice-quantity Víðir Valberg Guðmundsson 2019-08-09 10:19:26 +0200
• 807579ec5d qrcode: move caption before qrcode Florian Klink 2019-08-08 21:12:33 +0200
• aa252c3d11 info_desk/scan.html: show quantity if it's a ShopTicket and single_ticket_per_product is set Florian Klink 2019-08-08 21:07:03 +0200
• 95e04b3741 ShopTicket: use @property instead of get_orp() method Florian Klink 2019-08-08 21:05:55 +0200
• b72101ab70 Added sponsor logo Thomas Flummer 2019-08-08 16:58:57 +0200
• 9dd6b0b23c Fix scanning stuff. Víðir Valberg Guðmundsson 2019-08-08 13:06:24 +0200
• 470115a0d9 Search for orders and mark them as paid. Víðir Valberg Guðmundsson 2019-08-08 12:43:59 +0200
• 59dec88c04 Fix subject. Víðir Valberg Guðmundsson 2019-08-08 11:53:46 +0200
• ddd5b61cd1 Templates fixes. Víðir Valberg Guðmundsson 2019-08-08 11:38:08 +0200
• 8b0df39d13 missing logger Thomas Steen Rasmussen 2019-08-08 11:24:44 +0200
• d1c3535c7e read file as binary Thomas Steen Rasmussen 2019-08-08 11:21:53 +0200
• f594815685 use .read() so we pass the actual bytes from the file Thomas Steen Rasmussen 2019-08-08 11:12:28 +0200
• 17ff6efb8f Use list_display instead. Víðir Valberg Guðmundsson 2019-08-08 11:11:17 +0200
• cd66b5fd5d More email stuff. Víðir Valberg Guðmundsson 2019-08-08 11:09:25 +0200
• 4def56ad92 Adding outgoingemailadmin. Víðir Valberg Guðmundsson 2019-08-08 11:03:46 +0200
• 89d7d95f78 Adding outgoingemailadmin. Víðir Valberg Guðmundsson 2019-08-08 11:00:58 +0200
• 0be95742a2 missing imports and other small fixes Thomas Steen Rasmussen 2019-08-08 10:55:38 +0200
• 7f95f41055 email sponsor tickets one by one Thomas Steen Rasmussen 2019-08-08 10:44:37 +0200
• 38b7cae7d7 Fix missing colon. Víðir Valberg Guðmundsson 2019-08-08 10:28:02 +0200
• 2ba70c692f Remove multiple attachment code - was not even done Víðir Valberg Guðmundsson 2019-08-08 10:26:47 +0200
• 2751b92cb8 Find the right sponsors. Víðir Valberg Guðmundsson 2019-08-08 10:03:27 +0200
• 74a9e9df71 Check if tickets are generated. Also show if tickets are generated in the admin. Víðir Valberg Guðmundsson 2019-08-08 09:55:06 +0200
• ac19a6db4b add management command to email sponsor tickets Thomas Steen Rasmussen 2019-08-08 09:44:47 +0200
• 99977759ee
  Merge pull request #375 from bornhack/more_attachments Víðir Valberg Guðmundsson 2019-08-07 23:38:28 +0200
• 3600ed6190 Third times the charm? Víðir Valberg Guðmundsson 2019-08-07 23:33:56 +0200
• c088594e74 Actually add more attachments Víðir Valberg Guðmundsson 2019-08-07 23:29:13 +0200
• ba23234a15 Multiple attachments on mails Víðir Valberg Guðmundsson 2019-08-07 23:25:52 +0200
• ec2247a9eb
  Bump oauthlib from 3.0.2 to 3.1.0 in /src/requirements dependabot-preview[bot] 2019-08-07 05:45:00 +0000
• 943dcf8abd Add Mikjaer Studios logo. Víðir Valberg Guðmundsson 2019-08-06 12:07:41 +0200
• a1dc9f0413
  Merge pull request #373 from bornhack/sponsors Víðir Valberg Guðmundsson 2019-08-06 12:00:03 +0200
• 540bfdcbac Added more sponsor logos Thomas Flummer 2019-08-06 11:51:12 +0200
• ecb188c55a Merge branch 'master' into sponsors Thomas Flummer 2019-08-06 11:49:06 +0200
• 94a142f6b9 Polishing finding tickets by scanning and marking stuff as handed out/checked in. Víðir Valberg Guðmundsson 2019-08-04 00:18:52 +0200
• 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. Víðir Valberg Guðmundsson 2019-08-03 22:42:15 +0200
• b842bb99e7 Upgrade django to 2.2.4 Víðir Valberg Guðmundsson 2019-08-01 20:26:48 +0200
• 08d0dd7161 Make provided laptop default=True. Víðir Valberg Guðmundsson 2019-08-01 09:34:00 +0200
• dbd7a30e20
  Bump pytz from 2019.1 to 2019.2 in /src/requirements dependabot-preview[bot] 2019-08-01 05:38:56 +0000
• b89f09105c Make team guide only visible for approved members. Fix #369. Víðir Valberg Guðmundsson 2019-07-31 21:14:17 +0200