Commit graph

1532 commits

Author SHA1 Message Date
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
Jeppe Ernst 69f0c8aabd explain why we decorate /admin login 2017-12-31 00:16:07 +01:00
Jeppe Ernst 456ffa1bea useless/redundant file
forgot to remove it in the previous commit
2017-12-28 21:50:48 +01:00
Jeppe Ernst 7c5c8f6ac7 require 2fa for /admin pages
if the user has enabled 2fa
2017-12-28 21:37:34 +01:00
Jeppe Ernst f313935e6f initial setup of 2fa
issues:
* middleware temporarily removed, prevents login
* generated QR code has wrong issuer
* require OTP for /admin login not working (yet)
2017-12-28 16:22:26 +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
Benjamin Bach 9b9138f08c Adding team guides (markdown text) 2017-11-25 22:35:48 +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
Thomas Steen Rasmussen 8fd7f4c813 unfuck migrations maybe 2017-07-11 22:57:26 +02:00
Thomas Steen Rasmussen 533c1b3efa add initial people stuff 2017-07-11 22:50:31 +02:00
Stephan Telling f4a2f6cea6
add irc messages when new event- or speakerproposals are created 2017-07-11 22:29:06 +02:00
Stephan Telling c02598bfde
fix link in event proposal email 2017-07-11 22:20:53 +02:00
Stephan Telling fcd85f680a
fix #133
An email is now sent when a new speaker- or eventproposal is created and
when any such is updated.
2017-07-11 22:02:19 +02:00
Stephan Telling a67f9ee4a5
add mailing_list email field on team model 2017-07-11 19:39:43 +02:00
Thomas Steen Rasmussen a96d9f74be add new fields for the people page 2017-07-11 17:30:18 +02:00
Thomas Steen Rasmussen 124b8a6afd add a default for coinify_callback_hostname 2017-07-11 11:08:53 +02:00
Thomas Steen Rasmussen 974b90676e make coinify callback hostname configurable, so we can workaround old openssl in their callback engine 2017-07-11 11:06:46 +02:00
Thomas Steen Rasmussen 2e13525ad7 only mark as paid if not already paid (aka. dont create tickets again if we see a double callback) 2017-07-11 07:31:15 +02:00
Thomas Steen Rasmussen ec120bca39 only pass the invoicejson not the whole thing 2017-07-11 07:16:51 +02:00
Thomas Steen Rasmussen fe3e2b3d0a callbackobject.payload not invoicejson 2017-07-11 07:11:02 +02:00
Thomas Steen Rasmussen 69074d6496 another missing import 2017-07-11 07:06:25 +02:00
Thomas Steen Rasmussen 1d23989df1 pass order to save_coinify_callback 2017-07-11 07:02:17 +02:00
Thomas Steen Rasmussen 588a36ee56 missing import 2017-07-11 06:57:39 +02:00
Thomas Steen Rasmussen 55316e1bd0 missing import 2017-07-11 06:54:15 +02:00
Thomas Steen Rasmussen bded5d8192 field is called allow_video_recording in EventProposal 2017-07-11 05:24:08 +02:00
Víðir Valberg Guðmundsson 65a085b3ab Output event instance datatimes as timezone. 2017-07-10 12:57:35 +02:00
Víðir Valberg Guðmundsson c313397def Fix video alert in event modal. 2017-07-10 12:50:15 +02:00
Stephan Telling b9fcd841f7 Merge branch 'master' of github.com:bornhack/bornhack-website 2017-07-09 21:26:20 +02:00
Stephan Telling 6744ee1959
add field to allow video recording on event proposal 2017-07-09 21:24:25 +02:00
Víðir Valberg Guðmundsson c32d4aee82 Filter proposals. 2017-07-09 17:00:44 +02:00
Thomas Steen Rasmussen 38d8c25775 fix argument name 2017-07-09 16:54:21 +02:00
Thomas Steen Rasmussen 4f0de99ea2 fix bug in speaker<>camp relationship validation in signal handler 2017-07-09 16:48:02 +02:00
Víðir Valberg Guðmundsson 034543595a Fix error in consumer when camp matching query does not exist. 2017-07-09 16:37:19 +02:00
Víðir Valberg Guðmundsson af94eba144 Fixing 2019 logo 2017-07-09 16:20:22 +02:00
Víðir Valberg Guðmundsson bd8989d9bc Order camps 2017-07-09 16:16:21 +02:00
Víðir Valberg Guðmundsson b27bac8500 Fix error hvor speaker will be added every time a modal is opened. 2017-07-09 16:12:10 +02:00
Víðir Valberg Guðmundsson a32f04548c Adding icon which shows is an event will be recorded or not. 2017-07-09 16:07:59 +02:00
Víðir Valberg Guðmundsson 624ae872a3 Add filtering for events 2017-07-09 15:48:29 +02:00
Víðir Valberg Guðmundsson aa29480498 Apply filtering to ICS button. 2017-07-08 23:00:54 +02:00
Stephan Telling d38d6ce66a Merge branch 'master' of github.com:bornhack/bornhack-website 2017-07-08 20:17:40 +02:00
Stephan Telling 32651eafa7
add initial files for 2019 2017-07-08 20:16:58 +02:00
Stephan Telling 1cea9cf4a4
wrap text about foreign payments in alert class 2017-07-08 20:14:14 +02:00
Víðir Valberg Guðmundsson 2c5815982c Make product categories clickable. 2017-07-08 17:48:10 +02:00
Stephan Telling 0472769513
rename logos for fixing caches 2017-07-08 17:20:59 +02:00
Víðir Valberg Guðmundsson cc8777107e Fixing templates for the new logos. 2017-07-08 16:55:05 +02:00
Víðir Valberg Guðmundsson a1db2dc699 Fixing logos for other years as well. 2017-07-08 16:42:14 +02:00
Víðir Valberg Guðmundsson 95139e483f Adding 2018 logos 2017-07-08 16:23:03 +02:00
Thomas Steen Rasmussen beea33e0b8 remove safety valve to only output to debug channel 2017-07-03 23:02:00 +02:00
Thomas Steen Rasmussen b542853217 lower message check interval a bit 2017-07-03 22:46:47 +02:00
Thomas Steen Rasmussen 6c43e59371 send stats in seperate message, and shorten the ticket names a bit, and disable 1day tickets for now 2017-07-03 22:22:35 +02:00
Thomas Steen Rasmussen 8c01963c8d self.bot please 2017-07-03 21:19:20 +02:00
Thomas Steen Rasmussen 9ad6ba3f6b more nickserv fun 2017-07-03 21:16:07 +02:00
Thomas Steen Rasmussen 205e112718 add nickserv functionality 2017-07-03 21:08:47 +02:00
Thomas Steen Rasmussen 79cd7d73c4 add some more logging to the irc bot 2017-07-03 20:53:44 +02:00
Thomas Steen Rasmussen 7601b33b6a use list() not [] 2017-07-03 20:07:54 +02:00
Thomas Steen Rasmussen 84f79572b0 get channel list to join from settings 2017-07-03 20:05:12 +02:00
Thomas Steen Rasmussen a527e0dd0f a few more changes to irc worker stuff 2017-07-03 19:46:49 +02:00
Thomas Steen Rasmussen 5c689e4076 queue an irc message when we sell a ticket 2017-07-03 19:28:50 +02:00
Thomas Steen Rasmussen 4d9663123a add coinifyapiinvoice property to order model 2017-06-20 09:02:13 +02:00
Thomas Steen Rasmussen e839396d40 right, tempinvoice 2017-06-20 00:18:57 +02:00
Thomas Steen Rasmussen cc874cdbb8 loop over invoices to check if they expired 2017-06-20 00:13:37 +02:00
Thomas Steen Rasmussen 3010033b75 pass request to create_coinify_invoice() 2017-06-19 23:52:01 +02:00
Thomas Steen Rasmussen 45a5f58ddf add missing import 2017-06-19 23:46:52 +02:00
Thomas Steen Rasmussen 11fff93c41 use secure cookies 2017-06-05 23:22:12 +02:00
Stephan Telling 3141e8f588
add missing import, remove unused import and minor changes 2017-06-05 14:52:59 +02:00
Stephan Telling 1e1008a582
fix #131 2017-06-05 10:46:57 +02:00
Stephan Telling be5b6a08a1
add large_svg method on camp model and logos 2017-06-04 16:08:41 +02:00
Stephan Telling 1bfe068d77
add 2018 templates 2017-06-04 13:42:23 +02:00
Stephan Telling 733028e4b7
move createcamp script to camps app 2017-06-04 13:08:59 +02:00
Stephan Telling 6cf4e9577b
fix template names in sponsor app for consistency 2017-06-04 13:05:59 +02:00
Thomas Steen Rasmussen dd736066f7 fixup the team pages a bit, column names and stuff 2017-05-25 19:56:34 +02:00
Thomas Steen Rasmussen f4b2e55478 use name from profile not name from user 2017-05-25 17:36:20 +02:00
Thomas Steen Rasmussen 9bc9ed1ef7 hide <th> when no buttons, add ? to headline 2017-05-24 08:02:33 +02:00
Thomas Steen Rasmussen 0007e5424c split team management into seperate page, fix a few small things 2017-05-24 07:49:32 +02:00
Stephan Telling f2ad740ca2
fix #125 2017-05-23 23:15:31 +02:00
Thomas Steen Rasmussen 903b214d86 do not make all checkboxes in the world invisible 2017-05-23 23:11:32 +02:00
Stephan Telling a0a8d65f34
add missing import 2017-05-23 22:28:21 +02:00
Stephan Telling e7c3b264f4 Merge branch 'master' of github.com:bornhack/bornhack-website 2017-05-23 22:25:35 +02:00
Stephan Telling 79bf459659
send emails for approve/remove actions in team manage 2017-05-23 22:25:06 +02:00
Thomas Steen Rasmussen 96a9f9d4e8 show name from profile 2017-05-23 22:21:48 +02:00
Stephan Telling 49bfc58dda Merge pull request #127 from bornhack/develop
fix #123
2017-05-23 22:09:27 +02:00
Stephan Telling 93fdfd5712 add approve action 2017-05-23 22:02:36 +02:00
Thomas Steen Rasmussen f5b612cf0c add member remove button 2017-05-23 22:02:10 +02:00
Thomas Steen Rasmussen 916dba52c1 add member remove button 2017-05-23 21:21:47 +02:00
Thomas Steen Rasmussen 26a8a9d70d quote key 2017-05-22 21:11:06 +02:00
Thomas Steen Rasmussen 36d3d6d3bf json fun 2017-05-22 21:00:52 +02:00
Thomas Steen Rasmussen 6b42358ad6 fix json saves 2017-05-22 20:52:00 +02:00
Thomas Steen Rasmussen cd59f9cf4b add CoinifyAPIRequest to admin 2017-05-22 20:45:22 +02:00
Thomas Steen Rasmussen 475efc08fb kwargs not invoicedict 2017-05-22 20:20:12 +02:00
Thomas Steen Rasmussen 9e5626ddf1 missing import 2017-05-22 20:12:37 +02:00
Thomas Steen Rasmussen e2ba7c84a3 add missing argument 2017-05-22 20:03:41 +02:00
Thomas Steen Rasmussen 916fde4a4d switch to jsonfield 2017-05-22 19:42:20 +02:00
Thomas Steen Rasmussen 1b27145ecb some changes to models.py got lost somehow 2017-05-22 19:41:08 +02:00
Thomas Steen Rasmussen 8644d4ba2f Coinify multiinvoice fix (#126)
* rework coinify api stuff, work in progress

* fix imports

* indentation

* rework coinify api stuff, work in progress

* fix imports

* indentation
2017-05-22 18:03:09 +02:00
Stephan Telling 167ec6cd90
Merge branch 'develop' of github.com:bornhack/bornhack-website into develop 2017-05-21 23:12:03 +02:00
Stephan Telling 469b708782 Merge pull request #124 from bornhack/emailworker
add emailworker for async emails
2017-05-21 22:37:56 +02:00
Stephan Telling eab2c41f9b
fix bcc_recipients 2017-05-21 22:11:54 +02:00
Stephan Telling 750ab94f93
add defaults for to_recipients in send_mail and add_outgoing_email 2017-05-21 21:14:06 +02:00
Stephan Telling da26b3e0d3
add str method for OutgoingEmail 2017-05-21 20:57:16 +02:00
Stephan Telling 46cf9c53f7
verify invoice emails gets added to the queue and fix names 2017-05-21 20:43:05 +02:00
Stephan Telling febecc137d
rename send email to add email and log on error 2017-05-21 20:15:27 +02:00
Stephan Telling c55c68beff
add bcc and cc to email system 2017-05-21 20:13:49 +02:00
Stephan Telling 6a98ee3564
use a list for recipients rather than a string 2017-05-21 18:06:45 +02:00
Stephan Telling f986617c64
only log if theres emails to be processed 2017-05-21 16:48:06 +02:00
Stephan Telling 95e363b831
change logging from info to debug in emailworker 2017-05-21 16:23:13 +02:00
Stephan Telling 06a24c5899 make manage page part of detail page 2017-05-21 16:06:34 +02:00
Stephan Telling 3395fe8bd5 start work on #123 2017-05-21 16:06:34 +02:00
Stephan Telling 63648cd08e
fix add_outgoing_email to return false if emails cant be validated 2017-05-21 15:04:51 +02:00
Stephan Telling 73eaf5bae4
fix title in team_leave.html 2017-05-12 11:28:09 +02:00
Stephan Telling 3f21422057
start work on #123 2017-05-07 17:55:31 +02:00
Stephan Telling 1522e3997b
set is_staff for users who are responsibles in bootstrap-script 2017-05-07 17:16:35 +02:00
Stephan Telling edc128c94f
update bootstrap script with profile information for users 2017-05-07 16:24:57 +02:00
Stephan Telling e185da7436
add migrations for the OutgoingEmail model 2017-04-30 14:20:36 +02:00
Thomas Steen Rasmussen 12dbc05680 add missing migration for program 2017-04-30 14:12:23 +02:00
Thomas Steen Rasmussen e15c0bd20d add missing migration for profiles 2017-04-30 14:12:00 +02:00
Stephan Telling 098b6ea83c
update invoiceworker to reflect the new email system
Also removes some comments (for consistency) and some unused imports
2017-04-30 12:36:03 +02:00
Stephan Telling a8eb0ffe97
use filefield for email attachments, add logging for emailworker 2017-04-30 11:32:49 +02:00
Stephan Telling 16eb7cf594
use os.path.join to create paths for pdf files 2017-04-30 11:28:10 +02:00
Víðir Valberg Guðmundsson 5ef3e79b38 Making day menu responsive. 2017-04-29 14:58:21 +02:00
Víðir Valberg Guðmundsson 521d3c9c71 Fix type filter. 2017-04-29 13:21:06 +02:00
Víðir Valberg Guðmundsson 12d08a092c Still show icon on click. 2017-04-29 13:11:16 +02:00
Víðir Valberg Guðmundsson c32cde780a Adding icons 2017-04-29 12:23:10 +02:00
Thomas Steen Rasmussen 9513a903a3 specify daphne before channels to make it use the specified version as dependency 2017-04-28 09:21:00 +02:00
Thomas Steen Rasmussen a9c4eb97a3 add patched daphne to requirements.txt for now 2017-04-28 09:06:59 +02:00
Stephan Telling 2bab46050f
fix spelling in invoice_email, your -> you 2017-04-28 08:29:04 +02:00
Thomas Steen Rasmussen 62f9daa7e2 use fixed version of channels for now 2017-04-27 20:48:46 +02:00
Víðir Valberg Guðmundsson c845dca950 Now with support for days! 2017-04-27 00:23:03 +02:00
Stephan Telling 61b670931c
mark email as processed when send 2017-04-23 22:08:59 +02:00
Stephan Telling 1f4df68304
add outgoingemail model, add mailhelper function and worker 2017-04-23 22:04:58 +02:00
Stephan Telling 698698a96b
update bootstrap script with orders and orderproductrelations 2017-04-23 21:45:35 +02:00
Thomas Steen Rasmussen 5c4487d513 send email to team responsibles, not to the person joining the team 2017-04-22 00:23:12 +02:00
Víðir Valberg Guðmundsson 30c56afb83 Small esthetic fix. 2017-04-21 19:13:44 +02:00
Víðir Valberg Guðmundsson 13631eac93 Now also mark the filters accordingly to URL. 2017-04-21 19:09:46 +02:00
Víðir Valberg Guðmundsson 0dc10d3f95 Support parameters in the URL again. 2017-04-21 18:33:25 +02:00
Víðir Valberg Guðmundsson 60cf09b172 Making checkboxes more nice. 2017-04-21 15:02:20 +02:00
Víðir Valberg Guðmundsson 9fb372e114 Highlight "All days" when selected 2017-04-21 14:07:39 +02:00
Víðir Valberg Guðmundsson 3122092326 All filters should be checked on start. 2017-04-21 11:28:22 +02:00
Víðir Valberg Guðmundsson e36eb17ac8 Removing all those console.log's 2017-04-21 01:37:43 +02:00
Víðir Valberg Guðmundsson 9071a9c524 Revamping filtering big time! 2017-04-21 01:34:22 +02:00
Víðir Valberg Guðmundsson 691c6533c3 Fix bornhack 2016 logo. 2017-04-20 10:02:25 +02:00
Thomas Steen Rasmussen 1b8d17e77f forgot to change a place 2017-04-20 00:49:36 +02:00
Thomas Steen Rasmussen f62f91d0c3 change admin action to approve membership 2017-04-20 00:46:40 +02:00
Thomas Steen Rasmussen 9fd05583f4 fix some spacing around imaged on 2017 frontpage 2017-04-20 00:20:46 +02:00
Thomas Steen Rasmussen a3437bf1d0 add one more picture to the 2017 frontpage 2017-04-20 00:05:13 +02:00
Víðir Valberg Guðmundsson 70b853b669 Remove channel panel. 2017-04-19 23:53:43 +02:00
Víðir Valberg Guðmundsson 3ba47f95bc Also use svg for non-camp logo. 2017-04-19 23:46:48 +02:00
Víðir Valberg Guðmundsson 01a8958153 Make logo clickable again. 2017-04-19 23:45:01 +02:00
Víðir Valberg Guðmundsson 21fabac47a Adding some highlight to events in day view. 2017-04-19 23:37:14 +02:00
Víðir Valberg Guðmundsson f5018613f0 Fixing overview. 2017-04-19 23:15:06 +02:00
Víðir Valberg Guðmundsson f7749adb23 Adding modals and websockets to day view. 2017-04-19 22:37:30 +02:00
Kasper Friis Christensen 370ea8ada1 Converted text to outline 2017-04-19 21:12:56 +02:00
Kasper Friis Christensen 8e1a8de9aa Beautified dropdown 2017-04-19 21:12:56 +02:00
Kasper Friis Christensen 5043b07188 Corrected tagline font in logo 2017-04-19 21:12:56 +02:00
Kasper Friis Christensen f4dd5fff94 Updated logo pngs and updated logos to svg and png fallback 2017-04-19 21:12:56 +02:00
Kasper Friis Christensen f45c7a3b73 Centered footer on desktop 2017-04-19 21:12:56 +02:00
Kasper Friis Christensen 9a17c3220d Show all footer on mobile 2017-04-19 21:12:56 +02:00
Kasper Friis Christensen 761804eda1 Updated media query to match break point 2017-04-19 21:12:56 +02:00
Kasper Friis Christensen 7b93526f8d Update mobile navigation 2017-04-19 21:12:56 +02:00
Kasper Friis Christensen ec7a6c0054 Removed double border in btn-groups 2017-04-19 21:12:56 +02:00
Thomas Steen Rasmussen b0890fd7d8 add channel layers to environment_settings.py.dist, remember to update your local dev environment_settings.py or nothing will work 2017-04-19 09:30:01 +02:00
Thomas Steen Rasmussen dad1c6a352 remove channel layer from settings.py 2017-04-19 09:29:19 +02:00
Thomas Steen Rasmussen 305503d60a switch to using supervisord so rename worker runner 2017-04-18 22:15:04 +02:00
Stephan Telling 0f9ba324cd Merge branch 'master' of github.com:bornhack/bornhack-website 2017-04-18 20:49:19 +02:00
Stephan Telling 49d4f74472
redo email for shop and edd email for team app 2017-04-18 20:46:57 +02:00
Víðir Valberg Guðmundsson f96c8b6db5 Show speakers in the modal. Also removed favorite action when anonymous. 2017-04-17 20:29:59 +02:00
Víðir Valberg Guðmundsson d511df399d Fixing footer. 2017-04-16 02:20:59 +02:00
Víðir Valberg Guðmundsson 68aa108310 Adding favoriting to the schedule. 2017-04-16 02:10:45 +02:00
Thomas Steen Rasmussen 9f18d94ee1 add asgi.py file 2017-04-15 20:01:24 +02:00
Víðir Valberg Guðmundsson cad2b468e4 Only create the modal if it does not exist. 2017-04-15 19:43:30 +02:00
Víðir Valberg Guðmundsson 10ff284997 Adding channels panel. 2017-04-15 19:36:33 +02:00
Víðir Valberg Guðmundsson 8000896f3d Adding channels with the schedule as first app using them. 2017-04-15 19:35:18 +02:00
Kasper Christensen 9d70782b70 Added site fonts to .fa-select (#120)
godt spottet tak
2017-04-14 23:37:29 +02:00
Víðir Valberg Guðmundsson 4f6e6bcd3f Adding modal for events for better userinterface. 2017-04-14 23:29:40 +02:00
Thomas Steen Rasmussen 5a53be04a1 add a fuckton of favicon stuff, working on #109 2017-04-14 19:39:44 +02:00
Stephan Telling 033ec1b8b5 add membership status on team detail and list view 2017-04-14 16:16:00 +02:00
Stephan Telling 6bc0d57a52 add admin actions to add/remove users from teams 2017-04-14 16:16:00 +02:00
Víðir Valberg Guðmundsson 7b2659df4a Fix camp detail pages. 2017-04-14 16:12:26 +02:00
Víðir Valberg Guðmundsson cd93414864 Fix menu problem at 768px 2017-04-14 15:59:24 +02:00
Víðir Valberg Guðmundsson 7df14cc7b2 Change the width to be wider! 2017-04-14 15:43:32 +02:00
Thomas Steen Rasmussen cc771d20f1 only show creditnotes belonging to the logged in user 2017-04-14 15:36:41 +02:00
Thomas Steen Rasmussen 1e337ec8cd make text on password change button shorter 2017-04-14 15:36:09 +02:00
Thomas Steen Rasmussen f33a9393c0 hide area from team list 2017-04-13 18:50:16 +02:00
Thomas Steen Rasmussen 1b6d965a75 add volunteer profile, fixes #116 2017-04-13 17:44:46 +02:00
Víðir Valberg Guðmundsson 463a57172e Move text on events top the top 2017-04-13 14:19:50 +02:00
Víðir Valberg Guðmundsson 431c15e380 Adding right headers for ics view. 2017-04-13 14:14:44 +02:00
Víðir Valberg Guðmundsson ac39068e9b Filter events by camp. 2017-04-13 14:01:50 +02:00
Víðir Valberg Guðmundsson 898f5aa3ef Reducing text 2017-04-13 13:53:52 +02:00
Víðir Valberg Guðmundsson 222b995766 Adding ics button, also some ScheduleView refactor. 2017-04-13 13:42:14 +02:00
Víðir Valberg Guðmundsson 5e322472e2 Refactored ics code and added filtering. 2017-04-13 11:48:55 +02:00
Thomas Steen Rasmussen ec53bae454 change message when logging in to show email instead of username 2017-04-13 11:21:20 +02:00
Thomas Steen Rasmussen ca8661ce4d hide new speaker proposal and new event proposal buttons when call for speakers is not open, fixes #105 2017-04-11 14:13:43 +02:00
Thomas Steen Rasmussen 43c0ce5882 encode before hashing 2017-04-11 08:33:52 +02:00
Thomas Steen Rasmussen 29eda9999f remove unused code frm another project 2017-04-11 08:33:17 +02:00
Thomas Steen Rasmussen 2550b99b2b encode to utf8 before hashing 2017-04-11 08:19:18 +02:00
Thomas Steen Rasmussen a71cd34f1f make some links on the call for speakers relative and fix some wording 2017-04-10 17:06:58 +02:00
Thomas Steen Rasmussen 182ec6fef4 wording 2017-04-09 17:52:41 +02:00
Thomas Steen Rasmussen e2037f929a remove message when there is no speakers 2017-04-09 17:51:20 +02:00
Thomas Steen Rasmussen 0d7ec82f35 show call for speakers button always 2017-04-09 17:49:44 +02:00
Thomas Steen Rasmussen e91e181c57 add 2017 call for speakers 2017-04-09 17:45:02 +02:00
Thomas Steen Rasmussen 6288cfd9df remove 2016 from coinify messages 2017-04-08 11:58:29 +02:00
Thomas Steen Rasmussen 63a10d3af1 encode, decode, do something to make this work 2017-04-08 11:41:36 +02:00
Thomas Steen Rasmussen 7506326cd7 decode the utf8 encoded body to a unicode string before passing it on 2017-04-08 11:28:08 +02:00
Thomas Steen Rasmussen 0d5d6dc31e str() not neccesary here 2017-04-08 11:09:54 +02:00
Thomas Steen Rasmussen 8a318400ae changed the wrong model :( 2017-04-08 11:04:39 +02:00
Thomas Steen Rasmussen e4e5688e3c permit blank payload in callbacks 2017-04-08 10:55:40 +02:00
Thomas Steen Rasmussen e5215830b0 catch anything here 2017-04-08 10:50:51 +02:00
Thomas Steen Rasmussen 809e22311d more work on the wording on the team list page 2017-04-08 10:14:06 +02:00
Thomas Steen Rasmussen 5a4da9bdff more work on team templates 2017-04-08 10:09:06 +02:00
Thomas Steen Rasmussen a16c6c4ba3 small template change to team list 2017-04-08 09:58:16 +02:00
Thomas Steen Rasmussen 5431ff1852 remove member? column 2017-04-08 09:57:00 +02:00
Thomas Steen Rasmussen 54625985df show message when team doesnt need members! 2017-04-08 09:48:54 +02:00
Thomas Steen Rasmussen 1bb2b8d9a9 a bit more work on the team admin 2017-04-08 09:39:43 +02:00
Thomas Steen Rasmussen ae355516ba fixup the admin for teams 2017-04-08 09:27:33 +02:00
Thomas Steen Rasmussen ff74141d17 add link to teams page to frontpage 2017-04-08 08:40:03 +02:00
Thomas Steen Rasmussen ba7a589a06 use wording from flyer 2017-04-08 08:24:20 +02:00
Thomas Steen Rasmussen 1b98c01f63 improved error handling, always save callback body, various fixes 2017-04-03 18:00:25 +02:00
Thomas Steen Rasmussen 3be7319dc3 return User objects for team responsible 2017-04-03 09:22:15 +02:00
Thomas Steen Rasmussen 8ed58664f2 make it possible to overrule responsible on team level 2017-04-02 23:33:55 +02:00
Thomas Steen Rasmussen c90837a8f0 json.loads wants strings 2017-04-02 21:55:14 +02:00
Thomas Steen Rasmussen 3f69d8521e show if a ticket is used or not 2017-04-02 21:40:44 +02:00
Thomas Steen Rasmussen 39b2963b18 readd submodule with the correct branch 2017-04-02 20:21:12 +02:00
Thomas Steen Rasmussen 905091f923 remove submodule 2017-04-02 20:20:11 +02:00
Thomas Steen Rasmussen 56741335aa a few template fixes for team pages 2017-04-02 20:05:43 +02:00
Thomas Steen Rasmussen fe1708bb2c show team member count, only show join team button when team needs members 2017-04-02 19:54:06 +02:00
Thomas Steen Rasmussen 5b88085ac5 trailing , 2017-04-02 19:27:50 +02:00
Thomas Steen Rasmussen 39afd3f01f show real name if possible 2017-04-02 19:23:23 +02:00
Thomas Steen Rasmussen d2a78dcf1c add some more details to team list and detail pages 2017-04-02 19:11:11 +02:00
Thomas Steen Rasmussen 0dc1ca9704 rework team stuff 2017-04-02 18:04:57 +02:00
Thomas Steen Rasmussen 3f9fd744ee reenable epay payments 2017-04-02 17:04:20 +02:00
Thomas Steen Rasmussen 3dd3c71a8c fix bootstrap script after leader->responsible rename 2017-04-02 10:03:04 +02:00
Thomas Steen Rasmussen 37b54d799e fix a few things on the 2017 camp detail page, fixes #101 2017-04-01 23:32:42 +02:00
Víðir Valberg Guðmundsson f2b411b60a Adding subteams to teams 2017-04-01 23:16:23 +02:00
Víðir Valberg Guðmundsson 2864593b00 Moving some menus around. 2017-04-01 21:45:43 +02:00
Thomas Steen Rasmussen 35f22bdb71 adapt ics code to work with eventinstances instead of the old event.days system 2017-03-31 19:42:10 +02:00
Thomas Steen Rasmussen 33689c5270 fix a few ics related things, move ics functions to seperate file 2017-03-31 19:33:19 +02:00
Thomas Steen Rasmussen 3cc2f21bfb hand merge and commit PR #76 2017-03-31 19:25:48 +02:00
Thomas Steen Rasmussen 206e68b2e9 manually merge PR #78 2017-03-31 18:41:17 +02:00
Víðir Valberg Guðmundsson 5d4c4952d5 Teams (#100)
* Initial model for volunteers app.

* Rename Volunteers to Teams. Add view and templates.

* Adding detail page.
2017-03-31 17:29:28 +02:00
Thomas Steen Rasmussen 9d75bb6d9d make it easier to distinguish villaged 2017-03-30 09:36:47 +02:00
Thomas Steen Rasmussen 9e3ed81731 fix pictures 2017-03-30 00:20:14 +02:00
Thomas Steen Rasmussen c11979083c fix ansible variable for invoice letterhead pdf 2017-03-30 00:19:34 +02:00
Thomas Steen Rasmussen dba34531ba quoting 2017-03-28 10:13:15 +02:00
Thomas Steen Rasmussen 4e865d146e add wkhtmltopdf path to environment_settings.py.dist 2017-03-28 10:10:27 +02:00
Thomas Steen Rasmussen 3bed6c25b8 initialise logger inside class so __name__ tells us where we are 2017-03-28 09:17:29 +02:00
Thomas Steen Rasmussen 70b6a51c5c fix comment 2017-03-28 09:17:08 +02:00
Thomas Steen Rasmussen 529be396f4 fixup the shop to work in the new multicamp world, fix pdf generation, add new letterhead templates, rework invoiceworker into a generic worker runner 2017-03-28 00:12:11 +02:00
Víðir Valberg Guðmundsson 69e475f854 Fix program view on mobile. 2017-03-27 21:24:56 +02:00
Stephan Telling b4bfd82174
remove print from shop_tags.py 2017-03-27 18:12:59 +02:00
Thomas Steen Rasmussen 489cc2f55f Merge branch 'master' of github.com:bornhack/bornhack-website 2017-03-26 15:05:39 +02:00
Thomas Steen Rasmussen cbd6457947 fixup the event list a bit, fixes #90 2017-03-26 15:05:29 +02:00
Stephan Telling 079ea6b2b8
add rough euro prices to the shop. fix #32 2017-03-26 13:57:00 +02:00
Thomas Steen Rasmussen 850de5554f fix customer comment error when changing payment method for an order with empty comment 2017-03-26 10:15:54 +02:00
Thomas Steen Rasmussen 27e5fcc407 a few more changes to order_detail.html template, and import fixed py3 version of coinify api 2017-03-24 03:01:28 +01:00
Thomas Steen Rasmussen ce7d34e8ab a few more changes to order_detail.html template, and import fixed py3 version of coinify api 2017-03-24 03:01:18 +01:00
Thomas Steen Rasmussen 5ef381f973 move coinify vendor stuff to a submodule 2017-03-24 01:58:04 +01:00
Thomas Steen Rasmussen 8956c5300f change dates and fix a few bugs in bootstrap script 2017-03-24 01:55:36 +01:00
Thomas Steen Rasmussen 8202d3fdb1 fixup the order detail page a bit 2017-03-24 01:55:09 +01:00
Thomas Steen Rasmussen d4a180e29e update all submodules 2017-03-24 01:00:38 +01:00
Thomas Steen Rasmussen eac9cbfa1e permit blank 2017-03-23 20:21:19 +01:00
Thomas Steen Rasmussen 171553677c fixup logging 2017-03-23 18:32:13 +01:00
Thomas Steen Rasmussen 4f61a95d83 refactor invoiceworker to be run by uwsgi, support graceful shutdown, and support reloading code without exiting 2017-03-21 13:35:00 +01:00
Thomas Steen Rasmussen bd93e0c2ea remove PDF_LETTERHEAD_FILENAME from environment_settings.py.dist 2017-03-20 18:39:44 +01:00
Thomas Steen Rasmussen f6637a77bc Merge branch 'master' of github.com:bornhack/bornhack-website 2017-03-19 23:08:46 +01:00
Thomas Steen Rasmussen 77141e7931 fixup bootstrap script, make Product.slug unique 2017-03-19 23:08:36 +01:00
Stephan Telling 2c28e22f34
move fa-select css to bornhack.css 2017-03-19 18:13:38 +01:00
Thomas Steen Rasmussen e95cc5ea93 add EnsureWritableCampMixin to villages 2017-03-18 16:54:23 +01:00
Thomas Steen Rasmussen 66f7b7ec2e fix CFS open mixin 2017-03-18 16:33:48 +01:00
Thomas Steen Rasmussen dd23490c01 add mixin to prevent adding and editing user submitted speaker and event proposals 2017-03-18 16:22:16 +01:00
Thomas Steen Rasmussen 5bc4edf991 deny changes to Speaker and Event proposals when call for speakers for the camp is not open 2017-03-18 16:19:40 +01:00
Thomas Steen Rasmussen 027e89e4ab super() in py3 2017-03-18 16:03:10 +01:00
Víðir Valberg Guðmundsson 62381a50e6 Make camp and slug unique together on villages. Also fix some url errors. 2017-03-18 15:38:12 +01:00
Thomas Steen Rasmussen b151192d02 refactor some of the common image code into a PictureViewMixin, and make pictures work with the devserver 2017-03-17 19:40:47 +01:00
Thomas Steen Rasmussen c532dac146 right align 'manage proposals' button 2017-03-17 17:58:29 +01:00
Thomas Steen Rasmussen a715cba597 add admin commands to approve speaker and event proposals 2017-03-16 00:30:59 +01:00
Thomas Steen Rasmussen c2528129a5 show headline, use badges 2017-03-15 22:58:54 +01:00
Thomas Steen Rasmussen 9997897160 a bit more work on location icons 2017-03-15 21:54:57 +01:00
Thomas Steen Rasmussen 2515c08d97 add planet icon for all locations 2017-03-14 23:32:40 +01:00
Thomas Steen Rasmussen 3d5c9a9508 add help text for icon field 2017-03-14 23:25:37 +01:00
Thomas Steen Rasmussen 9632cc3ec7 add icon unicode hex for eventlocations in bootstrap script 2017-03-14 23:24:05 +01:00
Stephan Telling 2a78b70171 Merge branch 'master' of github.com:bornhack/bornhack-website 2017-03-14 22:17:09 +01:00
Stephan Telling 8ddf21ba48
add fontawesome and begin work on adding icons on schedule
Also deletes an old 2016 info html page and removes tabs in
bornhack-2016_camp_detail.html
2017-03-14 22:14:37 +01:00
Thomas Steen Rasmussen 9f44c0f300 fix speaker proposal image upload stuff, maybe 2017-03-14 21:45:12 +01:00
Thomas Steen Rasmussen d159844750 fix user check 2017-03-14 18:06:23 +01:00
Thomas Steen Rasmussen e316ebbb44 typo 2017-03-14 17:37:44 +01:00
Thomas Steen Rasmussen 181a0e43b0 add some more speaker and event proposal submission stuff 2017-03-12 20:54:33 +01:00
Thomas Steen Rasmussen a8e81dbc6f rename mixin 2017-03-12 19:34:27 +01:00
Thomas Steen Rasmussen 52a70b1ee2 Merge branch 'master' of github.com:bornhack/bornhack-website 2017-03-12 19:07:22 +01:00
Thomas Steen Rasmussen a51b795bce rename models and views from submission to proposal 2017-03-12 19:06:03 +01:00
Stephan Telling 9125edc21f
add missing < in speaker_deatil.html 2017-03-12 16:56:04 +01:00
Stephan Telling 89bec82880
2016 camp readonly and public event types in bootstrap script 2017-03-12 16:54:00 +01:00
Thomas Steen Rasmussen 9dfa4f98e9 disable delete buttons 2017-03-12 16:30:55 +01:00
Thomas Steen Rasmussen 8598ddc2f7 add eventsubmission detail page and a few missing buttons 2017-03-12 16:27:37 +01:00
Thomas Steen Rasmussen 2148d1c542 a few more proposal submission fixes 2017-03-12 16:16:24 +01:00
Thomas Steen Rasmussen 18e50d5e85 typo 2017-03-12 15:52:24 +01:00
Thomas Steen Rasmussen ad3b826844 rework speaker and talk proposal stuff 2017-03-12 15:43:41 +01:00
Thomas Steen Rasmussen 1162a72627 add help_text for speaker fields 2017-03-11 12:12:07 +01:00
Thomas Steen Rasmussen d799240dae add is_public property to UserSubmittedModel and permit showing non-approved speakers in list and detail only to the owner user when logged in 2017-03-10 00:45:50 +01:00
Thomas Steen Rasmussen c7571ed9a3 add django-extensions 2017-03-10 00:07:13 +01:00
Thomas Steen Rasmussen b90566879d add ipython to requirements 2017-03-10 00:04:05 +01:00
Thomas Steen Rasmussen 9a8b552915 add name for the redirect urls 2017-03-10 00:01:14 +01:00
Thomas Steen Rasmussen 950ae4f2dc redirect to frontpage after login 2017-03-10 00:01:02 +01:00
Stephan Telling dc45460675
fix verification of admin user in bootstrap script 2017-03-08 23:51:43 +01:00
Thomas Steen Rasmussen 47c0a482f6 reserve the slug 'created' to stop creative souls from creating a url conflict 2017-03-08 02:02:51 +01:00
Thomas Steen Rasmussen 271bfccfff only show approved speakers 2017-03-08 02:02:08 +01:00
Thomas Steen Rasmussen e233d15de3 use include for this 2017-03-08 02:01:38 +01:00
Thomas Steen Rasmussen bd76e7cc7b better headline 2017-03-08 00:24:53 +01:00
Stephan Telling 656536974b fix error with CampRelatedModel 2017-03-08 00:24:14 +01:00
Thomas Steen Rasmussen f7b1f040bb fix merge conflict 2017-03-08 00:07:12 +01:00
Thomas Steen Rasmussen 334f0477fe start work on speaker and talk submissions 2017-03-08 00:00:17 +01:00
Stephan Telling d7435ffa96 update camp with read only field, fix #96 2017-03-07 21:44:30 +01:00
Thomas Steen Rasmussen 5f9f9bb1d4 Merge branch 'master' of github.com:bornhack/bornhack-website 2017-03-07 21:30:11 +01:00
Stephan Telling 1c1bc2188f update bootstrap script to verify emails of users, fix #97. 2017-03-07 20:21:07 +01:00
Thomas Steen Rasmussen eb6c0995bf add missing migration for video stuff 2017-03-06 19:39:27 +01:00
Thomas Steen Rasmussen ca42685e2b remove circus from requirements 2017-03-05 17:30:25 +01:00
Thomas Steen Rasmussen 9e4d3a28c3 add circus to requirements 2017-03-05 10:28:57 +01:00
Stephan Telling d06f2355de
add video fields on event model, fix #82 2017-02-23 21:51:36 +01:00
Stephan Telling 999c7e971b
show coming soon text for speakers, schedule and events. fix #93. 2017-02-22 10:02:02 +01:00
Stephan Telling ab01797e51
rename duplicate EventInstanceAdmin to EventLocationAdmin 2017-02-21 16:05:57 +01:00
Stephan Telling 9461f4da22
encode string as utf-8 before hashing 2017-02-20 20:07:58 +01:00
Thomas Steen Rasmussen 0ebd683e02 permit blank comments to make the admin less annoying 2017-02-20 19:34:12 +01:00
Thomas Steen Rasmussen eb13b2d6e2 use category name instead of uuid in settings 2017-02-20 17:32:57 +01:00
Thomas Steen Rasmussen 77f79ec64c make the small logo link to the camp detail page when viewing a camp specific page 2017-02-20 00:08:32 +01:00
Thomas Steen Rasmussen f1e4fc9fea fix url tag 2017-02-19 23:17:36 +01:00
Thomas Steen Rasmussen 81e2be93c7 handle the times when we have no resolver_match 2017-02-19 23:12:15 +01:00
Thomas Steen Rasmussen 9de824d877 there is no camp 2017-02-19 22:59:09 +01:00
Thomas Steen Rasmussen 69e222247b handle unknown camp url slugs with debugmode off 2017-02-19 22:56:11 +01:00
Thomas Steen Rasmussen 5452da1ddb fixup the camp menu a bit 2017-02-19 21:31:16 +01:00
Thomas Steen Rasmussen 6684b0cecd add some more stuff to the 2017 frontpage 2017-02-19 21:27:09 +01:00
Thomas Steen Rasmussen 3297ce17b2 remove unused frontpage template 2017-02-19 21:21:15 +01:00
Thomas Steen Rasmussen 98bb51941e add camp redirect views 2017-02-19 21:20:19 +01:00
Thomas Steen Rasmussen 0acf3e0fee something is wrong with the logo 2017-02-19 19:54:06 +01:00
Thomas Steen Rasmussen 4480b4efba add real logos for 2017 2017-02-19 19:51:16 +01:00
Thomas Steen Rasmussen 7e09945676 show speaker pictures when available 2017-02-19 19:44:46 +01:00
Thomas Steen Rasmussen 63465ad784 add missing import 2017-02-19 19:16:33 +01:00
Thomas Steen Rasmussen 9334f51c9a fix speaker pictures 2017-02-19 18:17:56 +01:00
Thomas Steen Rasmussen 9092af2b49 add /public/ to the start of upload_to 2017-02-19 14:05:26 +01:00
Thomas Steen Rasmussen 3e7b85c53f missing import, and add /public/ to the start of the url 2017-02-19 14:04:31 +01:00
Thomas Steen Rasmussen 56d8a9765d add view to show speaker pictures without exposing all of MEDIA_ROOT 2017-02-19 13:15:55 +01:00
Thomas Steen Rasmussen cb5c2386eb set upload path for speaker pictures 2017-02-18 12:44:12 +01:00
Thomas Steen Rasmussen c6b27de400 working on speaker pictures for issue #84 2017-02-18 12:30:26 +01:00
Thomas Steen Rasmussen e8dea3eccc add migration for ordering change in an earlier commit 2017-02-18 11:50:55 +01:00
Thomas Steen Rasmussen fa9584dcc7 show speakers on event detail page where relevant, fixes #91 2017-02-18 11:18:07 +01:00
Thomas Steen Rasmussen d73222ec9a remove newline 2017-02-17 19:10:57 +01:00
Thomas Steen Rasmussen 5d8891c2df remove newline 2017-02-17 19:01:17 +01:00
Víðir Valberg Guðmundsson 59bb0f8e3a Rewrite bits of the program scheduling to work better on mobile. 2017-02-17 17:17:32 +01:00
Thomas Steen Rasmussen 924141d922 show info headline 2017-02-16 22:52:40 +01:00
Thomas Steen Rasmussen 13cec1e911 render commonmark 2017-02-16 22:12:44 +01:00
Thomas Steen Rasmussen 464976c482 flip the sorting 2017-02-16 22:05:10 +01:00
Stephan Telling 73f7d5b1b2 Merge branch 'master' of github.com:bornhack/bornhack-website 2017-02-16 21:03:40 +01:00
Stephan Telling 9e5b147d6e
register eventlocation in program admin 2017-02-16 21:03:24 +01:00
Víðir Valberg Guðmundsson 12a5262cc4 Nitpicking - I\'m back 2017-02-16 18:05:58 +01:00
Thomas Steen Rasmussen b2a5874a1c make program filter buttons smaller 2017-02-11 18:24:26 +01:00
Thomas Steen Rasmussen 2c648b12c8 remove some unused markup, and fix color of text 2017-02-11 17:56:04 +01:00
Thomas Steen Rasmussen 10a1b55618 fix typo 2017-02-11 17:48:47 +01:00
Thomas Steen Rasmussen 8af7adc943 add DEBUG 2017-02-11 17:22:02 +01:00
Thomas Steen Rasmussen 9fc7d77834 add some missing quoting 2017-02-11 17:11:40 +01:00
Thomas Steen Rasmussen ca7a7560bb Merge branch 'master' of github.com:bornhack/bornhack-website 2017-02-11 16:51:29 +01:00
Thomas Steen Rasmussen a915662689 adapt environment_settings.py.dist to jinja format 2017-02-11 16:50:29 +01:00
Stephan Telling 3c59e7ed1d
update bootstrap script with food events for new locations feature 2017-02-11 14:34:30 +01:00
Thomas Steen Rasmussen 752a3f7e38 add EventLocation model, restructure schedule filtering navigation 2017-02-08 23:34:24 +01:00
Thomas Steen Rasmussen fa8426441b remove debug output 2017-02-02 14:40:26 +01:00
Thomas Steen Rasmussen 5bc728a2e8 ircbot and notification worker basic functionality works 2017-02-02 14:37:17 +01:00
Thomas Steen Rasmussen 3715d00701 Revert "remove __init__.py files"
This reverts commit c3a4994d35.
2017-02-02 00:18:23 +01:00
Thomas Steen Rasmussen c3a4994d35 remove __init__.py files 2017-02-01 21:41:00 +01:00
Thomas Steen Rasmussen 2ecda214ce small fixes to ircbot 2017-02-01 01:09:21 +01:00
Thomas Steen Rasmussen 330ab25bd3 wrap this baby in int() 2017-01-31 23:45:53 +01:00
Thomas Steen Rasmussen bae4e78b3f Merge branch 'master' of github.com:bornhack/bornhack-website 2017-01-31 23:40:20 +01:00
Thomas Steen Rasmussen 4cd344601a replace __unicode__ with __str__ here and there, remove camp title from event boxes on schedule overview 2017-01-31 23:39:49 +01:00
Stephan Telling 40a89ccf36
fix static -> static_src in createcamp command and readme 2017-01-31 23:30:31 +01:00
Thomas Steen Rasmussen dcbf9b6992 readd middleware with the 1.10 setting 2017-01-31 23:26:45 +01:00
Thomas Steen Rasmussen c047506d26 better example values for .dist 2017-01-31 23:02:27 +01:00
Thomas Steen Rasmussen 593b40ea6a remove accidental committed file 2017-01-31 22:59:29 +01:00
Thomas Steen Rasmussen 2a41b03e56 Merge branch 'master' of github.com:bornhack/bornhack-website 2017-01-31 22:50:49 +01:00
Thomas Steen Rasmussen ea14ae5e38 remove django-environ and more work on irc bot 2017-01-31 22:50:28 +01:00
Stephan Telling 2fa98cb02e
add command to create dirs and html files for a new camp 2017-01-31 22:03:03 +01:00
Thomas Steen Rasmussen 75122cfc4e py3 migrations 2017-01-31 18:52:25 +01:00
Thomas Steen Rasmussen 229bd11387 update requirements for py3 2017-01-30 19:23:36 +01:00
Thomas Steen Rasmussen ff1afd128d rename requirements file 2017-01-30 19:15:58 +01:00
Thomas Steen Rasmussen 9e5709d200 fix the stuff 2to3 got wrong 2017-01-30 12:22:43 +01:00
Thomas Steen Rasmussen 3a7b952090 first pass with 2to3 2017-01-30 12:16:07 +01:00
Thomas Steen Rasmussen 0ff37bbca5 move code to src/ folder 2017-01-30 12:06:49 +01:00