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

2284 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Steen Rasmussen bd32595783 remove unneeded imports from teams app 2018-03-04 14:42:57 +01:00
Thomas Steen Rasmussen d140155b63 remove unneeded imports from sponsors app 2018-03-04 14:41:51 +01:00
Thomas Steen Rasmussen 0d47ec5607 remove unneeded imports from people app 2018-03-04 14:39:01 +01:00
Thomas Steen Rasmussen ad9f9d1581 remove unneeded imports from ircbot app 2018-03-04 14:36:52 +01:00
Thomas Steen Rasmussen 81abf8db36 remove unneeded imports from info app 2018-03-04 14:35:27 +01:00
Thomas Steen Rasmussen 9e82013ca0 remove unneeded imports from bornhack app 2018-03-04 14:31:46 +01:00
Thomas Steen Rasmussen 6980f53a96 remove unneeded imports from bar app 2018-03-04 14:31:13 +01:00
Thomas Steen Rasmussen 477177a936 remove unneeded imports from backoffice app 2018-03-04 14:30:27 +01:00
Thomas Steen Rasmussen ee628f4183 move another import 2018-03-04 14:16:22 +01:00
Thomas Steen Rasmussen 0f0794edfa another missing requirement 2018-03-04 13:39:11 +01:00
Thomas Steen Rasmussen 7823317939 add missing imports 2018-03-04 13:29:43 +01:00
Thomas Steen Rasmussen 07b3387831 import later, add missing bit of signal, change model reference in signal connection 2018-03-04 13:19:42 +01:00
Thomas Steen Rasmussen fe4e47edb0 add a related_name for the camp relation for TeamArea, and a teams property to Camp model to make it easier to get all teams under all teamareas, also add exclude=None to the validate_unique call in our CleanedModel class 2018-03-04 12:48:35 +01:00
Thomas Steen Rasmussen 60c4bb49fb Create new CampPropertyListFilter based on admin.SimpleListFilter to use for admin filtering of CampRelatedModels where self.camp is a property instead of a real field. Change the Team models camp field to a property, and make the Team model use the new CampPropertyListFilter in the admin. Change the BaseTicket model to being a CampRelatedModel and add a camp property, also, while here move ticket_created signal to signals.py, connect it in apps.py and rename it to ticket_updated. Change Sponsor model to being a CampRelatedModel and add a camp property. 2018-03-04 12:04:07 +01:00
Thomas Steen Rasmussen 6fe1790e89 spelling 2018-03-04 09:19:16 +01:00
Víðir Valberg Guðmundsson caa8856f72
Merge pull request #200 from bornhack/fix_admin_for_info 
Fix admin for Info.
 2018-02-11 18:03:51 +01:00
Víðir Valberg Guðmundsson cb0c4d8588 Fix admin for Info. 2018-02-11 17:55:15 +01:00
Víðir Valberg Guðmundsson 2ffcec7bcd Adding 2018 letterheads. 2018-01-10 08:22:52 +01:00
Stephan Telling cdc35eb114
Merge pull request #198 from bornhack/st/fix-174 
work on #174
 2018-01-07 20:15:51 +01:00
Stephan Telling e3ad6c5657
update bootstrap script with better dates 2018-01-07 20:15:09 +01:00
Stephan Telling 328d6aa803
work on #174 2018-01-07 19:59:53 +01:00
Thomas Steen Rasmussen c676abd5cf add missing request argument 2018-01-07 17:36:44 +01:00
Víðir Valberg Guðmundsson f8379e2fda
Merge pull request #196 from bornhack/feature/improve_shop_product_admin 
Erhm...
 2018-01-07 17:25:20 +01:00
Víðir Valberg Guðmundsson 61f7e43bdb Erhm... 2018-01-07 17:20:45 +01:00
Stephan Telling 914c4e456e
Merge pull request #195 from bornhack/feature/improve_shop_product_admin 
Woops, available_in can be null
 2018-01-07 17:16:49 +01:00
Víðir Valberg Guðmundsson 19963db102 Woops, available_in can be null 2018-01-07 17:15:03 +01:00
Víðir Valberg Guðmundsson eb4a038019
Merge pull request #194 from bornhack/fix-card-btn 
place card btn in proper div
 2018-01-07 16:45:33 +01:00
Stephan Telling f047deba76
place card btn in proper div 2018-01-07 16:43:11 +01:00
Stephan Telling 84f187709b
Merge pull request #193 from bornhack/feature/improve_shop_product_admin 
Adding search and improve stuff on shop product admin.
 2018-01-07 16:00:13 +01:00
Víðir Valberg Guðmundsson 8e81a04b38
Merge pull request #192 from bornhack/reenable-cardpayment 
reenable cardpayment
 2018-01-07 15:58:42 +01:00
Víðir Valberg Guðmundsson 004be0a834 Adding search and improve stuff on shop product admin. 2018-01-07 15:56:52 +01:00
Stephan Telling 590bf9fa65
reenable cardpayment 2018-01-07 15:55:32 +01:00
Jeppe Ernst 69f0c8aabd explain why we decorate /admin login 2017-12-31 00:16:07 +01:00
Jeppe Ernst 456ffa1bea useless/redundant file 
forgot to remove it in the previous commit
 2017-12-28 21:50:48 +01:00
Jeppe Ernst 7c5c8f6ac7 require 2fa for /admin pages 
if the user has enabled 2fa
 2017-12-28 21:37:34 +01:00
Jeppe Ernst f313935e6f initial setup of 2fa 
issues:
* middleware temporarily removed, prevents login
* generated QR code has wrong issuer
* require OTP for /admin login not working (yet)
 2017-12-28 16:22:26 +01:00
Thomas Steen Rasmussen a0c646e1cf polish backoffice part 2 2017-12-12 22:48:45 +01:00
Benjamin Bach ecdc62df7c Add IBAN/SWIFT to custom invoices, bank name in settings - fixes #172 (#187) 2017-12-12 22:16:06 +01:00
Stephan Telling 93a827bf7e mark orders as paid in bootstrap script (#189) 
they are marked as payed such that tickets are generated so we can
design the backoffice$
 2017-12-12 22:13:38 +01:00
Thomas Steen Rasmussen 8595377066 rework backoffice part 1; ticket checkin and badge handout views still need some work 2017-12-12 21:57:17 +01:00
Thomas Steen Rasmussen 0806ff138e typo 2017-12-04 10:49:24 +01:00
Thomas Steen Rasmussen 74729ade14 fixup backoffice handout view a bit 2017-12-04 10:43:25 +01:00
Benjamin Bach 9b9138f08c Adding team guides (markdown text) 2017-11-25 22:35:48 +01:00
Víðir Valberg Guðmundsson 6a082e6b58 Lower the percentage for camp redirect. 2017-11-25 14:54:34 +01:00
Víðir Valberg Guðmundsson d8e7ad2d17 Loewr the percentage for camp redirect. 2017-11-25 14:48:46 +01:00
Víðir Valberg Guðmundsson 22da1cd268 Only responsible people should see the edit task button. 2017-11-25 13:26:09 +01:00
Thomas Steen Rasmussen 4dab2c1a4f create and edit tasks 2017-11-25 13:02:32 +01:00
Víðir Valberg Guðmundsson c20771da8a Fixed some stuff for ya' @tykling 2017-11-24 22:19:17 +01:00
Thomas Steen Rasmussen f725a5c941 more work on tasks 2017-11-24 22:06:23 +01:00
Stephan Telling d028c16966
add teamtasks in bootstrap script 2017-11-24 17:40:10 +01:00