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

1430 commits

This branch
This branch
All branches
Author SHA1 Message Date
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 e1386d6a96 Merge branch 'contentflow' 2018-05-26 14:40:33 +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 4060c947de
Merge pull request #225 from bornhack/remove_image_from_speaker_in_schedule 
Remove image from speaker in schedule
 2018-05-20 22:29:29 +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 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
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
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