Commit graph

885 commits

Author SHA1 Message Date
Víðir Valberg Guðmundsson db5a2e1d92 Hide shifts for non-members. 2018-08-05 18:31:43 +02:00
Víðir Valberg Guðmundsson a33e932858 Small representation fix. 2018-08-05 18:21:30 +02:00
Víðir Valberg Guðmundsson 6593d16966 Merge branch 'master' into feature/shift_planning 2018-08-05 17:46:45 +02:00
Víðir Valberg Guðmundsson e482b63c14 Fixing video icon and using another icon for non-recording. 2018-08-05 12:42:18 +02:00
Víðir Valberg Guðmundsson fe974e469b Show email for users when user is team responsible. 2018-08-05 12:23:33 +02:00
Víðir Valberg Guðmundsson 214026dfd7 Integrate into new teams structure. 2018-08-05 12:18:10 +02:00
Víðir Valberg Guðmundsson f5b80d9ac7 Merge branch 'master' into feature/shift_planning 2018-08-05 11:26:15 +02:00
Víðir Valberg Guðmundsson 2ad0568f64
Merge pull request #257 from bornhack/feature/team_refactor
Team site refactor
2018-08-05 11:18:03 +02:00
Thomas Steen Rasmussen 458ce45198 add village gear sections to backoffice 2018-08-05 09:29:58 +02:00
Víðir Valberg Guðmundsson 14c88cc9e4 Update the compiled version of the scedule. 2018-08-05 00:22:16 +02:00
Víðir Valberg Guðmundsson d6a2151cdf Rename placeholder for DateTimeRangeField - it is not the most elegant API to work with. 2018-08-05 00:18:51 +02:00
Víðir Valberg Guðmundsson ddd2d5d5dd Forgot this for previous commit. 2018-08-04 18:24:13 +02:00
Víðir Valberg Guðmundsson df3751ecb8 Remove include since we have everything for tasks in one place now. 2018-08-04 18:13:51 +02:00
Víðir Valberg Guðmundsson a4060c2815 Merge branch 'master' into feature/team_refactor 2018-08-04 18:11:32 +02:00
Thomas Steen Rasmussen 73ec701b06 add when and completed to teamtask model, move task list to an included file 2018-08-04 17:38:09 +02:00
Thomas Steen Rasmussen eb8e548c3f add Meetup eventtype in SpeakerProposalForm and EventProposalForm 2018-08-04 13:54:37 +02:00
Víðir Valberg Guðmundsson da75660f0d Final touches - I think. 2018-08-04 13:45:52 +02:00
Víðir Valberg Guðmundsson d08c299e8d Views can have an indirect relation to a team. 2018-08-04 13:27:05 +02:00
Víðir Valberg Guðmundsson ef4262995f
Merge pull request #256 from fALKENdk/253-change-the-z-index-of-the-menu
Changed z-index of .sticky
2018-08-04 13:12:51 +02:00
Thomas Steen Rasmussen eeab018a77 add dansk metal sponsor logo 2018-08-02 09:48:59 +02:00
Kasper Friis Christensen a2b0d2980a Minimized comment size 2018-08-01 21:27:02 +02:00
Kasper Friis Christensen 456d9377a6 Changed z-index of .sticky and added bootstrap z-indexes to bornhack.css as a comment 2018-08-01 21:15:43 +02:00
Stephan Telling d03af1c11e
use django.utils timezone rather than datetime 2018-08-01 12:25:43 +02:00
Stephan Telling e04038e4a0
add backoffice pages for merchandise orders and what merchandise to order 2018-08-01 11:50:16 +02:00
Stephan Telling e2ef635abc
overwrite get_queryset on ProductHandoutView and delete unused imports 2018-08-01 11:33:36 +02:00
Kasper Christensen c8e65b739d
Update bornhack.css
Made content under "Add to order" in shop items visible on iphone.
2018-07-31 13:43:39 +02:00
Víðir Valberg Guðmundsson 8f46897f0c Add LetsGo logo. 2018-07-30 13:54:36 +02:00
Thomas Steen Rasmussen b6a2ac07b1 crop pcbway logo a bit 2018-07-30 09:28:10 +02:00
Thomas Steen Rasmussen 6a62624355 add epson logo 2018-07-30 09:16:55 +02:00
Thomas Steen Rasmussen ae14b759fa add pcbway logo 2018-07-27 13:20:24 +02:00
Thomas Steen Rasmussen 6828807f2c forgot to rename variable one place 2018-07-26 21:06:00 +02:00
Thomas Steen Rasmussen 9517fb25ea pass request everywhere it is needed 2018-07-26 15:03:49 +02:00
Thomas Steen Rasmussen 016ac8adac use hasattr() and clean up urls 2018-07-24 19:02:58 +02:00
Víðir Valberg Guðmundsson 02977acd5e Some DRYing. 2018-07-23 23:12:57 +02:00
Víðir Valberg Guðmundsson c68015fe26 Teams detail page was starting to get crowded. This is the start of a mostly visual, but also structural, refactor. 2018-07-22 23:18:50 +02:00
Thomas Steen Rasmussen cf9e9ebd5a remove debug print 2018-07-20 08:04:12 +02:00
Víðir Valberg Guðmundsson 2bdd172b92 Fix multiple shifts create. Add deletion. Add a way to take a shift. 2018-07-19 22:46:26 +02:00
Thomas Steen Rasmussen 11a94b477c redirect to the events list if nothing is scheduled yet 2018-07-18 00:58:33 +02:00
Thomas Steen Rasmussen d46ccc530b handle empty results correctly in CampViewMixin, also add a text to the speaker list page when no speakers are found 2018-07-18 00:46:38 +02:00
Thomas Steen Rasmussen 025692d017 add icons to speaker list page 2018-07-18 00:15:14 +02:00
Thomas Steen Rasmussen a6b0332c9f small visual fixes, headline size and remove a stray </h4> and remove the text-container class from the speaker description markdown 2018-07-17 23:35:10 +02:00
Thomas Steen Rasmussen 00c053829e fix copy paste error which makes urls not be shown on event detail page, and fix headline 2018-07-17 23:27:20 +02:00
Thomas Steen Rasmussen 340a3eb58c only check for pk and slug when relevant 2018-07-17 22:47:14 +02:00
Thomas Steen Rasmussen 32e9b7c40b
Fix urls handling and other stuff (#249)
* update font-awesome to 5.1 and add fab- and fa-regular icons, fixed #244

* also handle slugs when dealing with SingleObjectMixin CBV views, fixes #248

* add missing trailing slash to bar/menu

* add missing trailing slash on event slugs, fixes #245

* fix a lot of stuff related to proposal URLs. actually display them on speaker and event detail pages. show the urltype icons. better messages on update and delete pages. fix 500 error when reapproving events. fix bug that made urls multiply when reapproving event. fixes #246 and fixes #247
2018-07-17 22:43:16 +02:00
Víðir Valberg Guðmundsson b602e394fe Fix CampViewMixin to deal properly with multiple camp_filters when dealing with SingleObjectMixin based CBVs 2018-07-17 20:46:30 +02:00
Víðir Valberg Guðmundsson 4f77b21a60 Add a way to create multiple shifts - needs a bit more work though. 2018-07-17 19:28:16 +02:00
Víðir Valberg Guðmundsson 8ac973bc61 Iterate over camo_filter and return the first one that returns results! (#243) 2018-07-16 16:07:38 +02:00
Víðir Valberg Guðmundsson 7f9dfdd6e1
Merge pull request #242 from graffen/saxologo
Add Saxo Bank logo
2018-07-13 14:42:03 +02:00
Thomas Steen Rasmussen d3ba04b6f2 fix coinify callbacks by passing request argument to order.mark_as_paid() 2018-07-13 14:38:01 +02:00
Jesper Hess 6737515ad4
Add Saxo Bank logo 2018-07-13 14:36:20 +02:00
Víðir Valberg Guðmundsson c103400046 Enable editing of shifts. With timezone rabbit hole. 2018-07-03 07:15:42 +02:00
Víðir Valberg Guðmundsson 102dfa7330 Initial work on shift planning. 2018-07-02 23:52:52 +02:00
Víðir Valberg Guðmundsson 9bfdc714f0
Merge pull request #222 from bornhack/feature/team_controlled_info
Make info categories team controlled
2018-07-01 17:34:22 +02:00
Thomas Steen Rasmussen bf864cb5bd also handle Slacking Off events in EventProposalForm 2018-06-26 23:37:39 +02:00
Thomas Steen Rasmussen 5493dbee47 change proposal status when the submitter adds or updates a URL 2018-06-26 23:37:20 +02:00
Thomas Steen Rasmussen ea2bfc8498 hide action buttons when not on the proposal page 2018-06-26 23:31:56 +02:00
Víðir Valberg Guðmundsson a42e23ebd5 Add slacking off to the if-elif-clause for creating a form for proposals. 2018-06-24 01:02:06 +02:00
Víðir Valberg Guðmundsson 5472dbb4b7 Fix village update view. 2018-06-24 00:41:58 +02:00
Thomas Steen Rasmussen 9bfc206b53 define model on all Village views, remove Villages custom manager 2018-06-21 12:32:02 +02:00
Víðir Valberg Guðmundsson 43f076262b Fix some outstanding issues with the team controlled info categories functionality. 2018-06-21 09:19:09 +02:00
Víðir Valberg Guðmundsson 635e57b7f9
Merge branch 'master' into feature/team_controlled_info 2018-06-21 08:53:47 +02:00
Víðir Valberg Guðmundsson 4c60415336 Make each model which inherit from CampRelatedModel but doesn not have a direct relation, define a camp_filter. (#240) 2018-06-20 22:03:29 +02:00
Thomas Steen Rasmussen b94e737e09 add new bornfiber sponsor logo 2018-06-19 19:24:46 +02:00
Thomas Steen Rasmussen f5be4d68d1 info and shop should use the |trustedcommonmark filter 2018-06-04 08:28:09 +02:00
Thomas Steen Rasmussen 4ad58188b2 change the default for link icons, move import for speakerproposalmodel earlier in dode, and add mark_as_rejected() method on eventproposal model 2018-06-03 23:36:07 +02:00
Thomas Steen Rasmussen 23c42985ae hide url action buttons when not inside the program app, and change urltype icons to include the 'fas' bit of the fontawesome class 2018-06-03 23:34:40 +02:00
Thomas Steen Rasmussen 2305416461 only show tables when at least one proposal is found 2018-06-03 23:24:50 +02:00
Thomas Steen Rasmussen a7a9a24c6c move debug logging so channel messages are not logged, the bot doesn't handle any channel messages anyway and we dont want the data 2018-06-03 22:39:05 +02:00
Thomas Steen Rasmussen 02a7af6303 Make content submission form stuff much nicer. More DRY and more nice. Use one class with a form __init__ kwargs which sets eventtype 2018-06-03 19:41:49 +02:00
Thomas Steen Rasmussen 3180ec457d switch backoffice to use the regular CampViewMixin 2018-06-03 18:33:51 +02:00
Thomas Steen Rasmussen 9c9edff4f7 check for empty duration when cleaning duration field 2018-06-03 17:20:45 +02:00
Thomas Steen Rasmussen 3fb2f44e94 add eventtype icons to event list and event detail views in program 2018-06-03 17:16:35 +02:00
Thomas Steen Rasmussen 64f4eebac3 handle cached_property as well as regular properties in our camp filtering on @property in CampViewMixin 2018-06-03 17:16:00 +02:00
Thomas Steen Rasmussen bff5bb292e add debate as eventtype in bootstrap-devsite, and fix commonmark templatefilter a few places I missed 2018-06-03 16:29:28 +02:00
Thomas Steen Rasmussen 811b8171af working on #232, this commit changes backoffice to be camp specific (although many of the actual functions are camp independent). Add backoffice/mixins.py with BackofficeViewMixin to keep it DRY. Add backoffice views to manage proposals. Move SpeakerProposal and EventProposal detail template to includes to they can be used from backoffice. Rename our commonmark templatetags so the names are more intuitive. 2018-06-03 15:34:04 +02:00
Thomas Steen Rasmussen b34fe62118 small visual fixes, add a button to remove speakerproposal from eventproposal 2018-05-27 17:19:19 +02:00
Thomas Steen Rasmussen 2ba8d153fe fix CFP url on bornhack 2020 frontpage 2018-05-27 16:31:57 +02:00
Thomas Steen Rasmussen 3d100c2f8a hide buttons that modify stuff when CFP is not open or camp is readonly 2018-05-27 16:27:41 +02:00
Víðir Valberg Guðmundsson 183da3d161 Add tagline to small logo for 2018. 2018-05-26 20:22:10 +02:00
Víðir Valberg Guðmundsson 6226417ad7 Fix lookups that were forgotten. 2018-05-26 20:14:48 +02:00
Thomas Steen Rasmussen 8e7dc4f80a move call for sponsors view to the database 2018-05-26 15:22:45 +02:00
Thomas Steen Rasmussen 7d9c730752 remove a couple of mixins that are not needed 2018-05-26 14:53:39 +02:00
Thomas Steen Rasmussen 53fa204455 Merge branch 'master' of github.com:bornhack/bornhack-website 2018-05-26 14:42:28 +02:00
Thomas Steen Rasmussen 9052526264 remove action buttons from proposal list, they can be found in the detail views, helps a lot with the width issues when things have long names 2018-05-26 10:48:38 +02:00
Thomas Steen Rasmussen 24371b629a reenable mails to Content team when speaker/eventproposals are created/updated, change so proposal URLs are opened in new window, add a message in browser when proposals are approved in the admin 2018-05-26 10:24:52 +02:00
Thomas Steen Rasmussen eb807a6853 move call for participation from template to the database, prepare to move call for sponsors in the same way. This commit means we will need to copy the content of the old templates to the prod db after deploy 2018-05-25 14:27:53 +02:00
Thomas Steen Rasmussen 157050d30e make it possible to remove a speakerproposal from an eventproposal, move proposal delete buttons to the proposal detail pages, fix a button here and there 2018-05-24 11:43:46 +02:00
Thomas Steen Rasmussen 1f58471927 default allow_video_recording to checked 2018-05-24 10:23:42 +02:00
Thomas Steen Rasmussen 3e12c98b95 for some reason all our test users were is_staff=True users 2018-05-23 23:34:54 +02:00
Thomas Steen Rasmussen 18c33383b7 add url support for speakerproposals and eventproposals, including new models Url and UrlType. Also switch to Django 2.0 path() syntax in various urls.py files getting rid of a lot of ugly regex \o/ 2018-05-23 23:28:27 +02:00
Víðir Valberg Guðmundsson 5b77cb5aa2 Implement a catchall for the remaining infocategories. 2018-05-20 22:27:41 +02:00
Víðir Valberg Guðmundsson decfa29659 Remove obsolete check. 2018-05-20 22:25:19 +02:00
Víðir Valberg Guðmundsson a8df8f0cee Make team a mandatory field on infocategory.g 2018-05-20 22:11:39 +02:00
Víðir Valberg Guðmundsson 317a1c0b1c Remove camp from infocategory and derive it from team. 2018-05-20 22:10:38 +02:00
Thomas Steen Rasmussen df783168c6 filter speakerproposals by user, and redirect directly to combined submit view if no existing speakerproposals was found 2018-05-20 21:54:36 +02:00
Thomas Steen Rasmussen 1fb4eb7e28 remove help box with status explanations, no room :( 2018-05-20 21:42:11 +02:00
Thomas Steen Rasmussen 84c19d01c1 remove tooltip, add missing update button on speakerproposal detail page 2018-05-20 21:36:33 +02:00
Thomas Steen Rasmussen 4720b34021 link to detail view rather than update view in the tables, shine up the detail views a bit 2018-05-20 21:32:05 +02:00
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