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

2106 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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 99977759ee
Merge pull request #375 from bornhack/more_attachments 
More attachments
 2019-08-07 23:38:28 +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
Víðir Valberg Guðmundsson a1dc9f0413
Merge pull request #373 from bornhack/sponsors 
More Sponsors
 2019-08-06 12:00:03 +02:00
Thomas Flummer 540bfdcbac Added more sponsor logos 
Added Umbraco, Dansk Magisterforening and zibra group
 2019-08-06 11:51:12 +02:00
Thomas Flummer ecb188c55a Merge branch 'master' into sponsors 2019-08-06 11:49:06 +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