Commit graph

923 commits

Author SHA1 Message Date
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
Thomas Steen Rasmussen fe4e47edb0 add a related_name for the camp relation for TeamArea, and a teams property to Camp model to make it easier to get all teams under all teamareas, also add exclude=None to the validate_unique call in our CleanedModel class 2018-03-04 12:48:35 +01:00
Thomas Steen Rasmussen 60c4bb49fb Create new CampPropertyListFilter based on admin.SimpleListFilter to use for admin filtering of CampRelatedModels where self.camp is a property instead of a real field. Change the Team models camp field to a property, and make the Team model use the new CampPropertyListFilter in the admin. Change the BaseTicket model to being a CampRelatedModel and add a camp property, also, while here move ticket_created signal to signals.py, connect it in apps.py and rename it to ticket_updated. Change Sponsor model to being a CampRelatedModel and add a camp property. 2018-03-04 12:04:07 +01:00
Thomas Steen Rasmussen 6fe1790e89 spelling 2018-03-04 09:19:16 +01:00
Víðir Valberg Guðmundsson cb0c4d8588 Fix admin for Info. 2018-02-11 17:55:15 +01:00
Víðir Valberg Guðmundsson 2ffcec7bcd Adding 2018 letterheads. 2018-01-10 08:22:52 +01:00
Stephan Telling cdc35eb114
Merge pull request #198 from bornhack/st/fix-174
work on #174
2018-01-07 20:15:51 +01:00
Stephan Telling e3ad6c5657
update bootstrap script with better dates 2018-01-07 20:15:09 +01:00
Stephan Telling 328d6aa803
work on #174 2018-01-07 19:59:53 +01:00
Thomas Steen Rasmussen c676abd5cf add missing request argument 2018-01-07 17:36:44 +01:00
Víðir Valberg Guðmundsson 61f7e43bdb Erhm... 2018-01-07 17:20:45 +01:00
Víðir Valberg Guðmundsson 19963db102 Woops, available_in can be null 2018-01-07 17:15:03 +01:00
Stephan Telling f047deba76
place card btn in proper div 2018-01-07 16:43:11 +01:00
Stephan Telling 84f187709b
Merge pull request #193 from bornhack/feature/improve_shop_product_admin
Adding search and improve stuff on shop product admin.
2018-01-07 16:00:13 +01:00
Víðir Valberg Guðmundsson 004be0a834 Adding search and improve stuff on shop product admin. 2018-01-07 15:56:52 +01:00
Stephan Telling 590bf9fa65
reenable cardpayment 2018-01-07 15:55:32 +01:00
Thomas Steen Rasmussen a0c646e1cf polish backoffice part 2 2017-12-12 22:48:45 +01:00
Benjamin Bach ecdc62df7c Add IBAN/SWIFT to custom invoices, bank name in settings - fixes #172 (#187) 2017-12-12 22:16:06 +01:00
Stephan Telling 93a827bf7e mark orders as paid in bootstrap script (#189)
they are marked as payed such that tickets are generated so we can
design the backoffice$
2017-12-12 22:13:38 +01:00
Thomas Steen Rasmussen 8595377066 rework backoffice part 1; ticket checkin and badge handout views still need some work 2017-12-12 21:57:17 +01:00
Thomas Steen Rasmussen 0806ff138e typo 2017-12-04 10:49:24 +01:00
Thomas Steen Rasmussen 74729ade14 fixup backoffice handout view a bit 2017-12-04 10:43:25 +01:00
Víðir Valberg Guðmundsson 6a082e6b58 Lower the percentage for camp redirect. 2017-11-25 14:54:34 +01:00
Víðir Valberg Guðmundsson d8e7ad2d17 Loewr the percentage for camp redirect. 2017-11-25 14:48:46 +01:00
Víðir Valberg Guðmundsson 22da1cd268 Only responsible people should see the edit task button. 2017-11-25 13:26:09 +01:00
Thomas Steen Rasmussen 4dab2c1a4f create and edit tasks 2017-11-25 13:02:32 +01:00
Víðir Valberg Guðmundsson c20771da8a Fixed some stuff for ya' @tykling 2017-11-24 22:19:17 +01:00
Thomas Steen Rasmussen f725a5c941 more work on tasks 2017-11-24 22:06:23 +01:00
Stephan Telling d028c16966
add teamtasks in bootstrap script 2017-11-24 17:40:10 +01:00
Thomas Steen Rasmussen 142afa5ead add teamtask support 2017-11-23 23:09:14 +01:00
Víðir Valberg Guðmundsson d4265edaa0 Remove docker compose setup, not working optimal. Might return later. 2017-11-23 21:47:10 +01:00
Thomas Steen Rasmussen 2e4a44271d filter unpaid, cancelled and refunded orders from backoffice view 2017-11-23 08:35:30 +01:00
Thomas Steen Rasmussen adbf1f4280 a few more changes to the shop order detail page related to 2017 merch batch 2 sale 2017-11-22 01:10:44 +01:00
Thomas Steen Rasmussen ead22bc0a7 disable credit card payments for now 2017-11-21 18:50:52 +01:00
Thomas Steen Rasmussen 40a76fa986 show in t&c that we only permit card payments on some products 2017-11-14 15:57:55 +01:00
Víðir Valberg Guðmundsson 1d4cfe7927
Merge pull request #182 from bornhack/docker-compose
Docker compose
2017-11-05 18:07:31 +01:00
Víðir Valberg Guðmundsson c3ebb6ebd3 Make sure that the enviroment_setting.py file is there. 2017-11-05 17:41:37 +01:00
Víðir Valberg Guðmundsson 44d2ce22ab Got the site up running using docker-compose. Also added a Makefile for convenience. 2017-11-05 17:26:20 +01:00
Stephan Telling 8b25a4ceb4
fix #169 2017-11-05 17:14:34 +01:00
Stephan Telling eb9f531b77
fix #165 2017-11-05 16:13:50 +01:00
Stephan Telling 5dd4eaf7f1
fix #170 2017-11-05 15:29:23 +01:00
Thomas Steen Rasmussen e957942181 remove old has_tickets context_processors 2017-10-04 00:25:19 +02:00
Thomas Steen Rasmussen 66014811a4 remove the old Ticket model, move irc notification signal handler to the new Tickets app, various cleanup, fixes #168 2017-10-04 00:06:49 +02:00
Thomas Steen Rasmussen e0e65212bc mark orderproductrelations as handed_out=True when Ticket objects have been created 2017-10-03 23:45:22 +02:00
Thomas Steen Rasmussen c914c23117 add datatables.net jquery table plugin to infodesk page 2017-10-03 23:09:11 +02:00
Thomas Steen Rasmussen 803c8c7ff3 Backoffice first steps + add 403.html (#173)
* start working on backoffice

* add 403.html
2017-10-03 21:14:07 +02:00
Vidir Valberg Gudmundsson a4930af92a Removed svgs (which are now in assets repo). 2017-10-01 16:56:36 +02:00
Thomas Steen Rasmussen 7eb8d2d6d2 copy paste error 2017-09-17 15:27:47 +02:00
Thomas Steen Rasmussen d14d67496d add danish_vat field to creditnote model and template 2017-09-17 15:00:38 +02:00
Thomas Steen Rasmussen 0064d69d90 maintain linebreaks in customer info in credit notes 2017-09-17 14:40:05 +02:00
Thomas Steen Rasmussen 88cb7934c1 only send to customer for credit notes linked to a user object 2017-09-17 14:32:21 +02:00
Thomas Steen Rasmussen c0f2478819 add customer field to credit notes for when they are not related to a user directly 2017-09-17 14:20:21 +02:00
Vidir Valberg Gudmundsson 7cf8085829 Fix #161. 2017-09-16 21:29:44 +02:00
Thomas Steen Rasmussen ae0571bece redo logo 2017-09-16 10:13:17 +02:00
Thomas Steen Rasmussen e3e574298e limit sponsor images to 300px wide 2017-09-16 10:08:23 +02:00
Thomas Steen Rasmussen 0a049b3b6d add logo for bornholmske spritfabrikker 2017-09-16 09:59:29 +02:00
Thomas Steen Rasmussen c2cfc0cdb4 add updated to list view 2017-09-14 22:58:45 +02:00
Thomas Steen Rasmussen 21184c9c67 add created and updated to order list and detail 2017-09-14 22:52:08 +02:00
Thomas Steen Rasmussen 4c621aed4b make it possible to have customorders and invoices without Danish VAT 2017-09-14 21:02:59 +02:00
Víðir Valberg Guðmundsson a1f30ccad5 Merge pull request #158 from reynir/ical-abstract-description
Add event abstract to iCal
2017-09-12 22:58:31 +02:00
Reynir Björnsson 68cba4659a Add event abstract to iCal
Testing, what is testing?!
2017-09-02 00:50:45 +02:00
Benjamin Bach a93a66b8ac Should set mapping to empty dict, not empty string
asgi_layer = backend_class(**config)
TypeError: type object argument after ** must be a mapping, not str
2017-08-28 21:56:58 +02:00
Benjamin Bach ceef9bbd55 Calling manage outside of src/ 2017-08-28 21:54:04 +02:00
Vidir Valberg Gudmundsson ee4c0819e4 Order categories and products alphabetically. 2017-08-26 20:28:11 +02:00
Vidir Valberg Gudmundsson 9be3e62842 Hiding sidebars. 2017-08-26 17:34:14 +02:00
Vidir Valberg Gudmundsson 3f18b59a6b HACKER THEME! 2017-08-26 17:31:46 +02:00
Vidir Valberg Gudmundsson 84672dff7c Smaller text! 2017-08-26 17:27:24 +02:00
Vidir Valberg Gudmundsson 2341658e59 Reload every 5 seconds. 2017-08-26 16:11:45 +02:00
Vidir Valberg Gudmundsson 3c83a6f70d Adding title and only showing products in stock. 2017-08-26 16:03:26 +02:00
Vidir Valberg Gudmundsson a9f1e4553b Initial bar app. 2017-08-26 03:49:30 +02:00
Thomas Steen Rasmussen 365827805c check that slugify has returned anything 2017-08-24 20:28:53 +02:00
Thomas Steen Rasmussen 6e3b6002c2 resize logo 2017-08-23 18:32:16 +02:00
Thomas Steen Rasmussen e574f97566 add varnish software sponsor logo 2017-08-23 18:29:24 +02:00
Vidir Valberg Gudmundsson 3885bad0c8 Last minute addition for badge registration. 2017-08-23 12:32:08 +02:00
Thomas Steen Rasmussen f952370280 typo 2017-08-23 03:09:41 +02:00
Thomas Steen Rasmussen ccfdfa1ba5 unfuck name fuck, well done swedes 2017-08-23 03:04:33 +02:00
Vidir Valberg Gudmundsson 3a984acf57 Fixing stuff 2017-08-22 20:09:26 +02:00
Vidir Valberg Gudmundsson 4e036cdbe2 Adding wether ticket is paid or not. 2017-08-22 20:02:17 +02:00
Vidir Valberg Gudmundsson 001bbd5dc0 More ticket admin tweaks. 2017-08-22 19:59:26 +02:00
Vidir Valberg Gudmundsson c0159cfecb Filter by camp. 2017-08-22 19:48:18 +02:00
Vidir Valberg Gudmundsson fabf8959d6 Move checked in to the front. 2017-08-22 19:45:01 +02:00
Vidir Valberg Gudmundsson f06a00db69 Adding search to admin for tickets. 2017-08-22 19:37:02 +02:00
Thomas Steen Rasmussen 65201831da add arrow ecs logo 2017-08-22 19:22:57 +02:00
Vidir Valberg Gudmundsson dd9ef2380a Camp redirect has to account for an ongoing camp. 2017-08-22 14:35:49 +02:00
Vidir Valberg Gudmundsson 385e98d84f Use | as delimiters. 2017-08-22 13:05:49 +02:00
Vidir Valberg Gudmundsson 0cdee23b30 Very basic CSV "export" 2017-08-22 13:00:42 +02:00
Vidir Valberg Gudmundsson 0edcaeb11e Adding inital version of program control center. 2017-08-22 11:48:51 +02:00
Vidir Valberg Gudmundsson 6a413cdd3c Fix too long event titles in day view. 2017-08-21 08:45:05 +02:00
Thomas Steen Rasmussen 659cfd4a37 resize logo 2017-08-20 02:14:35 +02:00
Thomas Steen Rasmussen 4e064967ba add dansk it logo 2017-08-20 02:13:33 +02:00
Thomas Steen Rasmussen c846f4e462 fix logo 2017-08-20 02:07:15 +02:00
Thomas Steen Rasmussen bd01070710 add f-secure logo 2017-08-20 02:00:27 +02:00
Thomas Steen Rasmussen c0d8e22ff6 inherit from CampRelatedModel 2017-08-20 01:05:30 +02:00
Thomas Steen Rasmussen 042a335269 fixup admin for Ticket models 2017-08-20 01:01:44 +02:00
Thomas Steen Rasmussen 3cde4af189 syntax 2017-08-20 00:44:55 +02:00
Thomas Steen Rasmussen ab22a6de4a fix filename in download view too 2017-08-20 00:39:59 +02:00
Thomas Steen Rasmussen c6ee407751 include ticket type in filename 2017-08-20 00:25:48 +02:00
Stephan Telling 3dcb43e575
fix detail template and add text to ticket if checked in 2017-08-20 00:02:05 +02:00
Stephan Telling c0c9e77532 Merge branch 'master' of github.com:bornhack/bornhack-website 2017-08-19 23:53:00 +02:00
Stephan Telling 15cc999e55
fix proper urls for ticket app 2017-08-19 23:49:55 +02:00
Thomas Steen Rasmussen 7f017b416c finally fix qr code method 2017-08-19 23:36:16 +02:00
Thomas Steen Rasmussen 3581e4d32d str() please 2017-08-19 23:30:25 +02:00
Thomas Steen Rasmussen b6c79a9cdd this is a function 2017-08-19 23:27:31 +02:00
Stephan Telling 13efe137b8 Merge branch 'master' of github.com:bornhack/bornhack-website 2017-08-19 23:17:25 +02:00
Thomas Steen Rasmussen 5f4e9d16e9 remove save method frm ShopTicket 2017-08-19 23:14:01 +02:00
Thomas Steen Rasmussen e6ca8a5c71 calculate qrcode_base64 on the fly 2017-08-19 23:10:13 +02:00
Thomas Steen Rasmussen bf56a1624c py3 syntax 2017-08-19 23:01:16 +02:00
Thomas Steen Rasmussen b790b84d6c not so super 2017-08-19 23:00:49 +02:00
Thomas Steen Rasmussen a07e74180e redo migrations for Tickets app again, fix BaseTicket to be abstract 2017-08-19 22:22:54 +02:00
Stephan Telling 984b82ba11
update tickets app with list and detail views
Also this commit allows users to download their ticket as PDF.
2017-08-19 22:06:32 +02:00
Thomas Steen Rasmussen 410905f3ce redo migrations completely 2017-08-19 21:33:13 +02:00
Thomas Steen Rasmussen b49ecb87b0 redo migrations for tickets app 2017-08-19 21:27:07 +02:00
Thomas Steen Rasmussen 89aa6bfa22 make baseticket inherit directly from uuidmodel and createdupdatedmodel 2017-08-19 21:11:07 +02:00
Thomas Steen Rasmussen 086578d3b8 show on event list when and if it has any instances 2017-08-19 20:44:07 +02:00
Thomas Steen Rasmussen 8f352d8191 put tickets page under maintenance for now 2017-08-19 12:48:54 +02:00
Stephan Telling 6d5a7522d8
move checked_in field to baseticket 2017-08-18 13:04:13 +02:00
Stephan Telling ac5fb77c7a
update bootstrap script with camps for tickettype 2017-08-17 21:18:43 +02:00
Stephan Telling fc87a13c05
update tickettype with camp, remove camp from baseticket
minor updates to template and str method of TicketType
2017-08-17 21:17:36 +02:00
Stephan Telling 85a1db6704
minor tweaks 2017-08-17 21:16:49 +02:00
Stephan Telling 86ec617b71 Merge branch 'master' of github.com:bornhack/bornhack-website 2017-08-17 19:10:20 +02:00
Stephan Telling ec428f78d5
update bootstrap script with tickettypes 2017-08-17 19:09:46 +02:00
Stephan Telling e828bc9c4a Merge pull request #150 from bornhack/tickets
Tickets
2017-08-17 18:51:56 +02:00
Stephan Telling eac39352cd
move generate_pdf_letter func to utils app 2017-08-17 18:38:25 +02:00
Stephan Telling ee8c9cf01c
mend 2017-08-17 17:53:45 +02:00
Stephan Telling 5eedb8ff03
update INSTALLED_APPS. add ticket_type and re-add old Ticket model
also updates bootstrap script with ticket_type
2017-08-17 17:52:22 +02:00
Stephan Telling bea270f8eb
add new tickets app 2017-08-17 17:51:24 +02:00
Vidir Valberg Gudmundsson 93300f3b30 Change midnight offset from 6 to 9. 2017-08-16 23:05:26 +02:00
Vidir Valberg Gudmundsson 5c9e5482f5 Really fixing bordering events this time. 2017-08-16 22:39:48 +02:00
Vidir Valberg Gudmundsson 99fa18c14d Fix events right up to each other. Unstick sidebar on event detail. 2017-08-16 21:10:27 +02:00
Vidir Valberg Gudmundsson 93ed88d641 Compile! 2017-08-16 19:58:26 +02:00
Vidir Valberg Gudmundsson 8055071b8b Adding ICS button. Make sidebar not sticky. 2017-08-16 19:58:04 +02:00
Vidir Valberg Gudmundsson 25eb491f24 Adding compiled version without debug. 2017-08-16 19:42:20 +02:00
Vidir Valberg Gudmundsson 9659871a3f Fix filter sidebar style. 2017-08-16 19:16:28 +02:00
Vidir Valberg Gudmundsson 08279a479a Latest compiled version with debug. 2017-08-16 18:30:02 +02:00
Vidir Valberg Gudmundsson bd1d139d2d Fixing ICSView. 2017-08-16 18:30:02 +02:00
Vidir Valberg Gudmundsson 27a4ff0bbb Comitting latest compiled version 2017-08-16 18:30:02 +02:00
Vidir Valberg Gudmundsson d44ef3bbd8 Adding small indicators of the number of events instances for the different filters. Resulted in some cleanup as well. 2017-08-16 18:30:02 +02:00
Vidir Valberg Gudmundsson 5ce2a59036 Adding lates compiled version. 2017-08-16 18:30:02 +02:00
Vidir Valberg Gudmundsson d4d7fad439 Cleanups. Adding Speaker detail. 2017-08-16 18:30:02 +02:00
Vidir Valberg Gudmundsson a447ca476f Working on event detail. Also small visual help in DayView. Also some favorite stuff. 2017-08-16 18:27:28 +02:00
Vidir Valberg Gudmundsson c237d4ecc7 Adding a back buton on event detail if noscript. 2017-08-16 18:27:28 +02:00
Vidir Valberg Gudmundsson 084d2cee6b Addin the missing template for noscript fallback. 2017-08-16 18:27:28 +02:00
Vidir Valberg Gudmundsson 3411aee34a Make a noscript fallback version of the schedule. 2017-08-16 18:27:28 +02:00
Vidir Valberg Gudmundsson d77564064f Adding compiled version with debug enabled. 2017-08-16 18:27:28 +02:00
Vidir Valberg Gudmundsson 7abd35ab66 Fixing websocket url. 2017-08-16 18:27:28 +02:00
Vidir Valberg Gudmundsson e103cb57b5 Pushing compiled and minified version with debug enabled for staging purposes. 2017-08-16 18:27:28 +02:00
Vidir Valberg Gudmundsson 5dfda5ec8c More styling. 2017-08-16 18:27:28 +02:00
Vidir Valberg Gudmundsson 1bcc3a0ba0 Finally this seems to work 😅 2017-08-16 18:27:28 +02:00
Vidir Valberg Gudmundsson 3e50ccc9d8 Some styling. 2017-08-16 18:27:28 +02:00
Vidir Valberg Gudmundsson 725535d4a7 Some progress on the dayview. 2017-08-16 18:27:28 +02:00
Vidir Valberg Gudmundsson a938f2406f Filtering by video recording is now possible. Also show video recording states. 2017-08-16 18:27:28 +02:00
Vidir Valberg Gudmundsson 4279653fcb Differentiating between data is too cumbersome, so now we just load everything on start. Think about optimizing later! 2017-08-16 18:27:28 +02:00
Vidir Valberg Gudmundsson 23d94145b7 Detail pages are for events. We now also load event data when accessing a detailpage directly. 2017-08-16 18:27:28 +02:00
Vidir Valberg Gudmundsson e8c0ab1941 Organized the code in a more sane manner. Also some websocket work. 2017-08-16 18:27:28 +02:00
Vidir Valberg Gudmundsson 543347aaff Adding detail view for event intances. 2017-08-16 18:27:28 +02:00
Vidir Valberg Gudmundsson 9b36959057 Remove that javascript garbage. 2017-08-16 18:27:28 +02:00
Vidir Valberg Gudmundsson ebf4526425 Woops, no need to commit compiled version yet. 2017-08-16 18:26:49 +02:00
Vidir Valberg Gudmundsson db14e7d80e Replace schedule_overview.html with schedule_overview_elm.html. 2017-08-16 18:26:49 +02:00
Vidir Valberg Gudmundsson b49a0ad556 Accomplished feature parity in filtering. 2017-08-16 18:26:49 +02:00
Vidir Valberg Gudmundsson a6470d2ec9 Initial work on the schedule written in elm. 2017-08-16 18:26:49 +02:00
Stephan Telling c04838377b
remove imports and ticket class from shop 2017-08-15 14:19:06 +02:00
Stephan Telling 477b1b85de
fix #147 2017-08-14 19:10:58 +02:00
Stephan Telling 973bdc575c
fix 144 2017-08-14 18:58:19 +02:00
Stephan Telling cc43b0cb4d Merge branch 'master' of github.com:bornhack/bornhack-website 2017-08-14 00:56:30 +02:00
Thomas Steen Rasmussen 5c84c81981 these do not belong here 2017-08-13 23:24:46 +02:00
Stephan Telling 756c90d2fb
filter team areas by camp 2017-08-13 17:21:00 +02:00
Stephan Telling ad9e93d692
fix #141 2017-08-13 15:42:42 +02:00
Stephan Telling 6456ee3fa7
fix #140 2017-08-13 14:58:38 +02:00
Stephan Telling f348566214
fix #139 2017-08-13 11:43:28 +02:00
Vidir Valberg Gudmundsson bdc6c35b48 Adding pdf for 2017 small logo. 2017-08-11 10:39:28 +02:00
coral 260a37af3c Fixed missing space in 'be excellent to eachother', maybe i'm wrong here, in which case sorry. 2017-08-10 20:55:13 +02:00
Vidir Valberg Gudmundsson d73e14afa8 Remove the white from the small logo for 2017 2017-08-10 15:16:40 +02:00
Stephan Telling e96dd27225 Merge pull request #145 from klarstrup/master
Add href attribute to Schedule -> All Days event link
2017-08-10 13:20:51 +02:00
Thomas Steen Rasmussen a4b618a269 make admin listing of custom orders more nice 2017-08-08 13:27:12 +02:00
Thomas Steen Rasmussen 1f89ff986c round vat to 2 decimals 2017-08-08 13:26:58 +02:00
klarstrup 5ff0289d6f Add href attribute to event link 2017-08-06 21:09:43 +02:00
Thomas Steen Rasmussen c5d7caf3fc better description for formfield 2017-08-01 15:28:04 +02:00
Thomas Steen Rasmussen 036fcf67ef add missing migrations from whatever 2017-08-01 15:26:36 +02:00
Thomas Steen Rasmussen 222da21e7f add some text describing how to propose stuff 2017-08-01 15:23:11 +02:00
Thomas Steen Rasmussen aa5eb1f904 fix bug that made all speakers and eventtypes visible when modifying an event proposal 2017-07-31 22:05:44 +02:00
Thomas Steen Rasmussen 9b44d9d451 fix a typo 2017-07-31 18:28:13 +02:00
Vidir Valberg Gudmundsson 992089f626 Remove random </li> tag. 2017-07-20 13:23:34 +02:00
Stephan Telling 56fc0b4db6
allow users to change the state of allow_video_recording when updating 2017-07-19 15:18:45 +02:00
Thomas Steen Rasmussen 87da054985 better message 2017-07-19 14:42:46 +02:00
Thomas Steen Rasmussen 57f90ec1ce fix irc message with ticket stats 2017-07-19 14:38:55 +02:00
Víðir Valberg Guðmundsson 4dc8e6d95f Delete bornhack-2019_sponsors.html 2017-07-19 12:20:28 +02:00
Víðir Valberg Guðmundsson 5320f853ff Delete bornhack-2018_sponsors.html 2017-07-19 12:19:59 +02:00
Víðir Valberg Guðmundsson 9b22837c8b Delete bornhack-2017_sponsors.html 2017-07-19 12:19:48 +02:00
Víðir Valberg Guðmundsson d98ec59ee6 Delete bornhack-2016_sponsors.html 2017-07-19 12:18:34 +02:00
Thomas Steen Rasmussen 9e53a5152e add missing 2016 sponsor 2017-07-19 12:04:59 +02:00
Stephan Telling d4ba512920 fix clean method for eventinstance
You can no longer save eventinstances where the camp year doesnt match
for its location and event.
2017-07-15 18:16:52 +02:00
Vidir Valberg Gudmundsson 5b1d1c79e9 Fix error where everything looks like it has a video. 2017-07-15 18:16:27 +02:00
Vidir Valberg Gudmundsson c5ae8f4d6e Revamp schedule code and fix #128. 2017-07-15 17:58:53 +02:00
Stephan Telling 1a3e1088f7
delete event if speakers arent approved or created 2017-07-15 17:17:19 +02:00
Stephan Telling 05946d065b
fix issue with approving eventproposal with unapproved speakers
This commit fixes some issues around approving eventproposals with no
speakers attached or unapproved speakers attached.
2017-07-15 16:48:30 +02:00
Vidir Valberg Gudmundsson 544d6ba07b Sponsors should be filterable by camp. 2017-07-15 16:20:51 +02:00
Vidir Valberg Gudmundsson ef8d3f3ecf Order sponsors alphabetically. 2017-07-15 16:04:31 +02:00
Stephan Telling b60d8fb9a8 fix #135 2017-07-15 15:57:31 +02:00
Vidir Valberg Gudmundsson d2c4a18df7 Styling, and hoping it looks good on @telling's big screen. 2017-07-15 15:35:38 +02:00
Vidir Valberg Gudmundsson d6a07110b7 "Just" use static files for logos. 2017-07-15 15:21:12 +02:00
Vidir Valberg Gudmundsson 7cd82ea3bb Adding models to the sponsor. 2017-07-15 15:21:12 +02:00
Stephan Telling cf81dbe870
remove print statements 2017-07-15 10:04:13 +02:00
Stephan Telling 9866149636
fix event proposal emails, name -> title 2017-07-14 11:03:35 +02:00
Stephan Telling 8b000d8dae
fix string formatting of uuid for irc message 2017-07-13 21:18:57 +02:00
Thomas Steen Rasmussen 79f240d4d1 settings is not a dict 2017-07-12 17:05:27 +02:00
Víðir Valberg Guðmundsson 471e260380 Fixing width on speaker image. 2017-07-12 15:49:52 +02:00
Víðir Valberg Guðmundsson 026324802b Make locations distinguishable 2017-07-12 11:36:23 +02:00
Víðir Valberg Guðmundsson 734c810cff Making EventLocations a bit more usable. 2017-07-12 11:07:11 +02:00
Thomas Steen Rasmussen a028a0696c change the order of text 2017-07-12 00:54:31 +02:00
Thomas Steen Rasmussen 11a9ac5eac a few design changes to people.html 2017-07-12 00:08:51 +02:00
Thomas Steen Rasmussen 9a47622bc6 a few small fixes to team pages 2017-07-11 23:32:56 +02:00
Stephan Telling 3ef4094e94 Merge branch 'master' of github.com:bornhack/bornhack-website 2017-07-11 23:15:31 +02:00
Stephan Telling 78c4f14048
fix irc message for proposals 2017-07-11 23:14:30 +02:00
Stephan Telling 534a2d790d
add missing migration 2017-07-11 23:14:05 +02:00
Thomas Steen Rasmussen 53199e4300 skip this for now 2017-07-11 23:11:31 +02:00