Commit graph

2320 commits

Author SHA1 Message Date
Víðir Valberg Guðmundsson 31f74fa010 Fix stupid mistakes. 2018-05-20 16:43:53 +02:00
Víðir Valberg Guðmundsson 63e34ce387 Food team deals with food. 2018-05-08 17:10:11 +02:00
Víðir Valberg Guðmundsson 650de5c067 Adding "add_teams_to_categories" migration. 2018-05-08 17:06:14 +02:00
Víðir Valberg Guðmundsson 280dd5785f Adding the compiled version of the schedule without speaker pictures. 2018-05-06 22:10:20 +02:00
Víðir Valberg Guðmundsson 91519e8b43 Remove speaker pictures from schedule. 2018-05-06 22:09:19 +02:00
Víðir Valberg Guðmundsson 642c452984 Add option to delete info item. 2018-05-06 21:55:50 +02:00
Stephan Telling 4ad568bb97
update 2018 logo 2018-05-06 20:29:19 +02:00
Stephan Telling 3846ebd3c3
Merge pull request #224 from bornhack/st/add-2020-boilerplate
add 2020 boilerplate
2018-05-06 17:06:16 +02:00
Stephan Telling a94eb6b610
fix dates in camp detail for 2019 2018-05-06 17:05:23 +02:00
Stephan Telling 752dcf99f0 show call for sponsors on sponsors page (#223) 2018-05-06 16:36:07 +02:00
Stephan Telling 1198b6c558
add zibra wireless logo 2018-05-06 16:31:47 +02:00
Stephan Telling 789b2b7cc8
fix copy paste errors in 2019 and 2020 camp templates 2018-05-06 15:19:52 +02:00
Stephan Telling 3bc9c36cb0
improve 2019 call for speakers page 2018-05-06 15:11:10 +02:00
Stephan Telling c67feb3d34
add boilerplate for 2020 camp 2018-05-06 15:10:02 +02:00
Víðir Valberg Guðmundsson 9d5a9daab4 Add what team is responsible for a category. 2018-05-06 13:24:20 +02:00
Víðir Valberg Guðmundsson e662064319 Add edit button to info items on the info page. 2018-05-06 13:22:04 +02:00
Víðir Valberg Guðmundsson 025a5f76b7 Change markup for the team detail page for a better overview/seperation. 2018-05-06 12:57:01 +02:00
Víðir Valberg Guðmundsson 92e394cce9 Add creation of info items. 2018-05-05 00:38:32 +02:00
Víðir Valberg Guðmundsson b668ac0694 Reorganize views for better clarity. Add editing capabilities for Info Items. 2018-05-05 00:19:24 +02:00
Víðir Valberg Guðmundsson 735f17b1f1 Add an FK to teams.Team on info.InfoCategory, version control it using django-reversion. 2018-05-04 23:40:43 +02:00
Thomas Steen Rasmussen 12563c890d fix logic in nickserv_username_changed() signal handler, fix wrong comment in irc3module.py 2018-05-02 22:33:54 +02:00
Thomas Steen Rasmussen e652a8156c use the builtin anti flood stuff in irc3 rather than a crude time.sleep() 2018-04-25 00:14:37 +02:00
Víðir Valberg Guðmundsson 35f01dddbc
Merge pull request #221 from bornhack/add_tests_to_shop
WIP Fix shop stock code and add tests.
2018-04-24 18:13:43 +02:00
Víðir Valberg Guðmundsson d8871b871f Merge remote-tracking branch 'origin/master' into add_tests_to_shop 2018-04-24 18:12:10 +02:00
Víðir Valberg Guðmundsson ac68daf0b6 Update admin. Fix some more tests. Add stock info to template. 2018-04-24 18:06:19 +02:00
Víðir Valberg Guðmundsson a250635132 Added the first tests to the project. Using factory_boy for great success. (#219) 2018-04-22 08:31:10 +02:00
Thomas Steen Rasmussen 9b2e164ddb add a backoffice view to approve public credit names, fixes #217 2018-04-22 08:28:46 +02:00
Víðir Valberg Guðmundsson c9ae322025 Added the first tests to the project. Using factory_boy for great success. 2018-04-21 23:06:41 +02:00
Thomas Steen Rasmussen 99e6fa80c5 add a small delay to avoid the bot triggering chanserv flood protection when a channel with a lot of members needs acl fixing, closes #214 I think 2018-04-21 18:03:36 +02:00
Víðir Valberg Guðmundsson 193c182422 Add stock_amount to product and reflect it in product detail template. (#213) 2018-04-21 17:00:39 +02:00
Víðir Valberg Guðmundsson 2eea0acf0e Woops, wrong model. Fix #179. 2018-04-15 19:45:34 +02:00
Víðir Valberg Guðmundsson 5e6ff4e76f Fix #179. 2018-04-15 19:44:14 +02:00
Víðir Valberg Guðmundsson 969e737d3e Add missing migrations (non db stuff). 2018-04-15 19:30:32 +02:00
Víðir Valberg Guðmundsson be7035594f Add created/updated to CreditNote and Invoice admins. Fix #199. 2018-04-15 17:29:24 +02:00
Víðir Valberg Guðmundsson adc0b71b97 Favicon stuff. Fix #211. 2018-04-15 16:47:13 +02:00
Thomas Steen Rasmussen 7a526156c9 remove CHANNELS_LAYERS and move ASGI_APPLICATION to settings.py 2018-04-14 17:30:12 +02:00
Thomas Steen Rasmussen f50f1fe2e0 fixup asgi.py for channels2 goodness 2018-04-14 17:04:21 +02:00
Thomas Steen Rasmussen 63c2f68990 no need for redis as long as we only have one server 2018-04-14 16:26:01 +02:00
Thomas Steen Rasmussen 870d1c9d67 Merge branch 'django-and-channels-upgrade' 2018-04-14 15:42:39 +02:00
Thomas Steen Rasmussen 281dacc3f9 resolve conflicts in teams/models.py 2018-04-14 15:41:27 +02:00
Thomas Steen Rasmussen 3df21f0fcc one more typo fix 2018-04-13 22:31:50 +02:00
Thomas Steen Rasmussen 1604d29771 another typo 2018-04-13 22:12:29 +02:00
Thomas Steen Rasmussen f73c6a1a11 this is a property of team 2018-04-13 22:01:05 +02:00
Thomas Steen Rasmussen 65e225f4b1 another stupid typo 2018-04-13 21:54:24 +02:00
Thomas Steen Rasmussen fa6981ea22 stupid typo 2018-04-13 21:47:36 +02:00
Thomas Steen Rasmussen a978ccb6ea fix the irc acl method, indentation and too early return 2018-04-13 21:29:19 +02:00
Thomas Steen Rasmussen 43aefc880a add a few things to the TeamAdmin 2018-04-13 20:55:25 +02:00
Thomas Steen Rasmussen 4d8b70f278 typo 2018-04-13 20:29:57 +02:00
Thomas Steen Rasmussen 1c4a4dd259 change irc channel stuff so each team can have both a private and a public irc channel, introduce the concept of a volunteer channel which all teammembers of all teams get access to 2018-04-13 20:22:19 +02:00
Víðir Valberg Guðmundsson 4d6caf6947
Merge branch 'master' into django-and-channels-upgrade 2018-04-13 11:19:48 +02:00