Commit graph

1506 commits

Author SHA1 Message Date
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
Thomas Steen Rasmussen cefdaaea97 add missing migration after text change (noop migration) 2018-04-11 23:05:36 +02:00
Thomas Steen Rasmussen 9951869a49 add a view to re-add IRC ACL if something went wrong the first time, add button on team_detail page to activate it 2018-04-11 10:22:28 +02:00
Thomas Steen Rasmussen fdb22777c4 make it possible to filter TeamMember by Camp in the Admin 2018-04-11 10:21:37 +02:00
Thomas Steen Rasmussen 547b594c8d add a Django Admin link to the menu if the logged-in user is staff 2018-04-11 10:21:09 +02:00
Thomas Steen Rasmussen 2ed19d22dc add method to setup a non-private channel, to be used later when we handle switching channels between private and public 2018-04-10 17:31:22 +02:00
Thomas Steen Rasmussen 9f4df30b50 tell the user to register nickserv account before entering it here 2018-04-10 17:27:44 +02:00
Thomas Steen Rasmussen 9b8e72a3c0 remove debug print and handle creation cases in signal handler 2018-04-09 23:24:36 +02:00
Thomas Steen Rasmussen edcf363027
Merge teamcomms branch. Refactor team app and add events app.
* Primary commit towards improved team communications. Add new events app to handle team notifications when various events happen, with a Type model which contain event types and a Routing model which controls routing of events to teams. Add shortslug for Camp and Team models. events.handler.py contains the code for sending irc and email notifications for teams. The first two eventtypes have been added in datamigrations, 'ticket_created' and 'public_credit_name_changed', and the tickets and profile apps have been adjusted accordingly. Team IRC channels can be marked as managed and if so the IRC bot will register the team channel with ChanServ if possible. Team IRC channels can be marked as private and the bot will set invite only and maintain an ACL with team members. Users can set their NickServ username in their profile to get on the ACL. Rework all team views and templates. Remove TeamArea model and make Team have an FK to Camp directly. Add docstrings a whole bunch of places. Move signal handlers to apps.py and signal_handlers.py in a few apps. Add basic team mailing list handling, more work to be done. Update bootstrap-devsite script to add more teammembers and add some team event routing for the two eventtypes we have.

* default to the console backend for email unless we specifically ask for realworld email

* fix signal for public_credit_name approval irc message

* fix name display on /people/ page

* fix the text on people pages when all non-responsible team members are anonymous

* handle cases where we fallback to the area responsible properly

* readd removed property, it is used in team_detail view

* make it possible to filter profiles by public_credit_name_approved

* add method for sending IRC messages in ircbot.utils.add_irc_message(), extend periodic bot method to do more than check for outgoing messages so rename it, refactor chanserv and nickserv handling code, create methods to check and join/part IRC channels as needed, maintain channel ACLs for private channels, do not autojoin any channels when instatiating the bot instead rely on the new check_irc_channels() method to join them, rename profile presave signal, add checking for changed nickserv usernames for acl handling, add teammember.irc_channel_acl_ok boolean to track ACL state, add missing help_text properties to TeamMember fields, rename teammember postsave signal, add teammember deleted signal, readd wrongly deleted EnsureTeamMemberResponsibleMixin

* add a few missing early returns
2018-04-09 23:11:05 +02:00
Víðir Valberg Guðmundsson aae3d7e3c9 Got channels2 working. 2018-04-03 20:52:39 +02:00