Thomas Steen Rasmussen
743cf25476
add abstract field for music acts
2018-05-20 21:29:37 +02:00
Thomas Steen Rasmussen
5dc3e17d66
if one or more speakerproposals exist show a list so the user can pick an existing or choose to add a new; use the multimodelform stuff only when the user wants to add a new speakerproposal
2018-05-20 21:11:53 +02:00
Víðir Valberg Guðmundsson
733fdbf4ba
Add lists of events/speakers til speaker/event detail template.
2018-05-20 20:53:28 +02:00
Víðir Valberg Guðmundsson
c8ab0230cd
Add detail view for speaker and event proposals.
2018-05-20 20:29:56 +02:00
Víðir Valberg Guðmundsson
b172d678fa
Add filter for tracks to the schedule
2018-05-20 20:08:25 +02:00
Víðir Valberg Guðmundsson
03b536ff26
Fix channels consumer for program for the new content flow.
2018-05-20 19:32:51 +02:00
Thomas Steen Rasmussen
039af44a92
new content submission flow monster commit of doom. fixes a large part of #191 . Split out /program/ urls into a seperate program/urls.py file in the program: URL namespace. Change call for speakers to call for participation everywhere (I think). Add boolean fields call_for_participation_open and call_for_sponsors_open to Camp model. Switch to font-awesome 5.0.13 and update <i> tags everywhere accordingly. Introduce Tracks so all Events belong to a Track, which in turn belongs to a Camp. Add seperate forms for submitting SpeakerProposals and EventProposals so we can set labels and help_text according to EventType, and remove fields we dont need. Remove Pictures from Speaker and SpeakerProposals, it was almost never used, and was a lot of code/complexity. Remove a few PROPOSAL_STATUS namely DRAFT and MODIFIED_AFTER_APPROVAL to simplify the workflow for submitters. Add description, icon and host_title fields to EventType. Add a CombinedProposalSubmitView which allows users to submit a SpeakerProposal and EventProposal from the same page, introducing a new requirements.txt dependency for django-betterforms==1.1.4. Update bootstrap-devsite to match the new reality.
2018-05-20 18:16:20 +02:00
Víðir Valberg Guðmundsson
d3273eb1bb
Small fix.
2018-05-20 18:07:42 +02:00
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
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
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
Víðir Valberg Guðmundsson
ff758b15ff
Initial work on uprading.
2018-04-03 18:44:10 +02:00
Thomas Steen Rasmussen
03fc20a459
add missing migrations after cleanup and adding of on_delete to all foreignkeys
2018-03-18 09:07:34 +01:00
Thomas Steen Rasmussen
01a55ae149
make our CampViewMixin also filter if camp happens to be a property and not a real model field
2018-03-04 17:17:57 +01:00
Stephan Telling
3acab3f08c
Merge pull request #203 from bornhack/st/on_delete-foreignkey
...
add on_delete to all foreignkeys
2018-03-04 16:34:42 +01:00
Víðir Valberg Guðmundsson
f8c86cac31
Should be team_slug, not slug ( #201 )
2018-03-04 16:34:10 +01:00
Stephan Telling
df5e167376
add on_delete to all foreignkeys
2018-03-04 16:26:35 +01:00
Stephan Telling
ba3eaa6546
Merge pull request #202 from bornhack/st/cleanup
...
Cleanup
2018-03-04 16:17:50 +01:00
Thomas Steen Rasmussen
075a43d245
remove irc3 command plugin for now since we are not using it
2018-03-04 16:17:32 +01:00
Stephan Telling
663099a603
cleanup in bar/
2018-03-04 16:00:30 +01:00
Stephan Telling
aaa4df27db
cleanup in camps/
2018-03-04 16:00:30 +01:00
Stephan Telling
d20a964793
cleanup in info/
2018-03-04 16:00:30 +01:00
Stephan Telling
f20695094e
cleanup in ircbot/
2018-03-04 16:00:30 +01:00
Stephan Telling
e482501d7b
cleanup in news/
2018-03-04 16:00:30 +01:00
Stephan Telling
aac89c0a9c
cleanup in profiles/
2018-03-04 16:00:30 +01:00
Stephan Telling
f9ba48ddfb
cleanup in program/
2018-03-04 16:00:30 +01:00
Stephan Telling
5bffb9c53a
cleanup in villages/
2018-03-04 16:00:30 +01:00
Stephan Telling
8026dba14f
cleanup in sponsors/
2018-03-04 16:00:30 +01:00
Stephan Telling
488767b4f0
cleanup in shop/
2018-03-04 16:00:30 +01:00
Stephan Telling
bc042a1755
add self to fix reference to team responsible
2018-03-04 15:22:13 +01:00
Stephan Telling
10bd3bdd0d
remove camp from team objects in bootstrap script
2018-03-04 15:18:59 +01:00
Thomas Steen Rasmussen
0c00524570
remove unneeded imports from villages app
2018-03-04 14:46:18 +01:00
Thomas Steen Rasmussen
99cb7f5307
remove unneeded imports from utils app
2018-03-04 14:44:33 +01:00
Thomas Steen Rasmussen
afa782b26b
remove unneeded imports from tickets app
2018-03-04 14:43:56 +01:00
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
Víðir Valberg Guðmundsson
