Commit graph

1771 commits

Author SHA1 Message Date
Víðir Valberg Guðmundsson 80e9c01f87
Merge pull request #277 from pwelzel/feature_custom_invoice_address
add custom address field to shop.models.Order and invoice template
2018-08-22 19:27:23 +02:00
Patrick Welzel 8b8191e16d add custom address field to shop.models.Order and invoice template 2018-08-22 15:41:24 +02:00
Thomas Steen Rasmussen af794e6a2f fix dates for 2019 2018-08-22 14:32:10 +02:00
Víðir Valberg Guðmundsson f7d17883be Display feedback a bit better. 2018-08-22 12:59:53 +02:00
Víðir Valberg Guðmundsson 09e916571e Use the existing event type if there is one and one is not defined. 2018-08-21 13:47:56 +02:00
Víðir Valberg Guðmundsson f2b7ad63ca Ooops. 2018-08-20 15:57:00 +02:00
Víðir Valberg Guðmundsson 98433be365 Should be a CampRelatedModel. 2018-08-20 15:52:11 +02:00
Víðir Valberg Guðmundsson 0aa198ba6c Save it! 2018-08-20 15:39:08 +02:00
Víðir Valberg Guðmundsson 2d58695ee4 Adding feedback functionality. 2018-08-20 15:13:51 +02:00
Víðir Valberg Guðmundsson d605abcb40 Use col-xs- instead of col-sm- to get a slightly better dayview. 2018-08-20 12:43:33 +02:00
Víðir Valberg Guðmundsson 2ef3c45bc1 Fix bootstrap script. 2018-08-19 19:52:00 +02:00
Víðir Valberg Guðmundsson b871613d24 Fix proposal submission. 2018-08-19 19:52:00 +02:00
Thomas Steen Rasmussen 52d3e827c8 show a message when all tokens have been found 2018-08-19 18:53:40 +02:00
Thomas Steen Rasmussen 387e4c1d87 filter on the correct id 2018-08-19 18:48:48 +02:00
Thomas Steen Rasmussen a6e12868b3 fix order of columns 2018-08-19 18:35:40 +02:00
Thomas Steen Rasmussen f408b0955a add missing <tr> tags 2018-08-19 18:33:31 +02:00
Thomas Steen Rasmussen fe4fdd06b0 show missing tokens, and show category/hint 2018-08-19 18:30:25 +02:00
Thomas Steen Rasmussen df34d3edf3 add category field, and add unique_together constraint to TokenFind model until I figure out why it is creating duplicates 2018-08-19 17:56:04 +02:00
Víðir Valberg Guðmundsson 97ba725ba2 Add missing migrations. 2018-08-19 17:40:33 +02:00
Thomas Steen Rasmussen 62d172f6c2 add secret token to base.html 2018-08-19 16:22:02 +02:00
Víðir Valberg Guðmundsson 014e962a3f use .get because it might not be there. 2018-08-19 00:06:25 +02:00
Víðir Valberg Guðmundsson b50f368dea Add a slides field to talk and lightning talk forms. 2018-08-18 20:43:24 +02:00
Víðir Valberg Guðmundsson 24cc84dcd1
Merge pull request #270 from benjaoming/readmeerr
rm dupe'ed instruction
2018-08-18 20:09:52 +02:00
Víðir Valberg Guðmundsson c8f6f76689 Make email mandatory and show that on the event proposal admin site. 2018-08-18 20:04:15 +02:00
Víðir Valberg Guðmundsson 428cee3cd7 Making event proposal admin slightly better. 2018-08-18 20:04:15 +02:00
Benjamin Bach 12cf5905a5 rm dupe'ed instruction 2018-08-18 19:34:33 +02:00
Thomas Steen Rasmussen 7dd52c78ee make the colours more visible on the camp list page, set camp colours in bootstrap script, add a light_text property to Camp model 2018-08-18 17:45:33 +02:00
Víðir Valberg Guðmundsson 84fff61ddb Forgot something. 2018-08-18 16:55:33 +02:00
Víðir Valberg Guðmundsson f15f878508 Add a proposal edit permission. 2018-08-18 16:37:20 +02:00
Víðir Valberg Guðmundsson 313ac788a4
Merge pull request #269 from benjaoming/readmeupdates
Add a development default settings file and modify instructions
2018-08-18 16:04:35 +02:00
Benjamin Bach 2673cd86e2 Add a development default settings file and modify instructions 2018-08-18 16:02:35 +02:00
Thomas Steen Rasmussen 016bfdc1a1 add secret token game code 2018-08-18 15:26:49 +02:00
Víðir Valberg Guðmundsson eb20b69c0a
Merge pull request #268 from benjaoming/psycopg2-update
Update psycopg2 to latest version
2018-08-18 15:20:03 +02:00
Benjamin Bach 0b3d8dafb8 Update psycopg2 to latest version 2018-08-18 15:06:27 +02:00
Víðir Valberg Guðmundsson 1af78e6ff7 Add email to SpeakerProposal and Speaker models. 2018-08-18 14:11:30 +02:00
Víðir Valberg Guðmundsson 83fa993ed1 Show SpeakerProposal email. 2018-08-18 13:36:11 +02:00
Víðir Valberg Guðmundsson b3ef1d7538 Add the ticket to the order admin. 2018-08-17 11:59:28 +02:00
Víðir Valberg Guðmundsson 932d6aaa90 Show only camp bar products. 2018-08-16 18:27:59 +02:00
Víðir Valberg Guðmundsson ff6912fed8 Spice up event instance admin. 2018-08-16 18:25:33 +02:00
Víðir Valberg Guðmundsson 104968ed32 Nor email. 2018-08-16 14:55:29 +02:00
Víðir Valberg Guðmundsson e7fd3d9986 Sponsor ticket has no name. 2018-08-16 14:53:58 +02:00
Víðir Valberg Guðmundsson 9fd5dc27bf User should be superuser to access complete backoffice. 2018-08-15 23:47:25 +02:00
Víðir Valberg Guðmundsson ccfb3d13d0 Fix access to backoffice with infodesk permissions. 2018-08-15 20:53:54 +02:00
Víðir Valberg Guðmundsson c02a80553f Actually use the boolean flag. 2018-08-15 11:48:24 +02:00
Víðir Valberg Guðmundsson 93d6525b29 Add missing non-db migrations. 2018-08-15 11:31:00 +02:00
Víðir Valberg Guðmundsson 47bf0fcdbf Add a command to generate sponsor tickets. 2018-08-15 11:30:42 +02:00
Víðir Valberg Guðmundsson 32f4ae13e3 Add some more ordering to TeamTask. 2018-08-15 00:17:03 +02:00
Víðir Valberg Guðmundsson fc3cc91ad4 Update 2019 logo with new dates. 2018-08-14 21:06:49 +02:00
Víðir Valberg Guðmundsson d9b7668ea8 Comments on tasks. 2018-08-14 20:13:46 +02:00
Víðir Valberg Guðmundsson 3d5645a10e Dumb error. 2018-08-13 19:06:30 +02:00