Commit graph

682 commits

Author SHA1 Message Date
Thomas Steen Rasmussen 6cabeebc9c stuff doesn't fit 2016-06-06 23:41:21 +02:00
Thomas Steen Rasmussen c728e27c64 fix menu styling, and urls for speakers+sponsors 2016-06-06 22:02:59 +02:00
Thomas Steen Rasmussen 5b2c35437b add calls for speakers and sponsors to menu 2016-06-06 21:53:17 +02:00
Thomas Steen Rasmussen ca084825db fix missing import in url patterns 2016-06-06 21:47:37 +02:00
Thomas Steen Rasmussen 6e4b52eb7f CoC wording and attribution 2016-06-06 21:43:57 +02:00
Thomas Steen Rasmussen 12862a2466 add call for sponsors and call for speakers placeholder text 2016-06-06 18:48:55 +02:00
Thomas Steen Rasmussen 3e5a56f322 more CoC corrections 2016-06-06 17:41:15 +02:00
Thomas Steen Rasmussen 88adb6352d small CoC related corrections 2016-06-06 17:39:51 +02:00
Thomas Steen Rasmussen 219ad2e5fd add code of conduct to website 2016-06-06 17:33:25 +02:00
Thomas Steen Rasmussen d82085673b set context_object_name for NewsDetail view 2016-06-05 23:34:30 +02:00
Thomas Steen Rasmussen 40427a1bc4 thats not what its called 2016-06-05 23:34:07 +02:00
Thomas Steen Rasmussen e5ea3267df missing migration for shop - product ordering and payment method default 2016-06-05 23:28:13 +02:00
Thomas Steen Rasmussen dd833b970b migration for news slugfield 2016-06-05 23:27:03 +02:00
Thomas Steen Rasmussen 4932bb1001 missing module prefix 2016-06-05 23:26:54 +02:00
Thomas Steen Rasmussen ef364f42cf working on news detail view 2016-06-05 23:20:06 +02:00
Thomas Steen Rasmussen 628488c1dc spelling, and add payment info to kiosk info 2016-06-04 10:13:38 +02:00
Thomas Steen Rasmussen c00dedb6d5 default to no payment method 2016-06-04 10:01:31 +02:00
Thomas Steen Rasmussen 7d679beae6 handle orders with no products 2016-06-04 09:49:22 +02:00
Thomas Steen Rasmussen fc077a43df add def get_email() to get email 2016-06-04 09:46:10 +02:00
Thomas Steen Rasmussen 731c7bd2a5 email is from User 2016-06-04 09:41:05 +02:00
Thomas Steen Rasmussen 161290db33 add more fields to order admin, permit filtering by cancelled 2016-06-04 09:37:54 +02:00
Víðir Valberg Guðmundsson 641201a856 Fix #43 2016-06-03 21:36:45 +02:00
Víðir Valberg Guðmundsson e4585c8f7e Mark order as closed when marking as paid. Add button to mark as paid. 2016-06-03 21:31:12 +02:00
Víðir Valberg Guðmundsson 746da234db Fix #45 2016-06-03 21:02:05 +02:00
Víðir Valberg Guðmundsson ede9adc250 Merge pull request #46 from bornhack/categorise_shop_list
Catagorise product list for better overview
2016-06-03 20:54:00 +02:00
Víðir Valberg Guðmundsson 94234b4294 Order by category and add a header for each category. 2016-06-03 19:08:23 +02:00
Víðir Valberg Guðmundsson 495608f1ba Add a link to orders and tickets on the profile page. 2016-06-03 18:53:33 +02:00
Thomas Steen Rasmussen cf3b4dee8b add tent info 2016-06-02 10:36:03 +02:00
Thomas Steen Rasmussen 78eaab5304 center and spelling 2016-06-01 19:49:05 +02:00
Thomas Steen Rasmussen 6de4280e09 mention explicitly that prices include VAT 2016-06-01 19:46:59 +02:00
Thomas Steen Rasmussen f9716c1b40 include timezone when showing availability 2016-06-01 18:55:24 +02:00
Thomas Steen Rasmussen 4c2cc2973f pull headline right too 2016-06-01 18:44:45 +02:00
Thomas Steen Rasmussen 0ed0a4d289 sort by price too 2016-06-01 18:42:26 +02:00
Thomas Steen Rasmussen 68bc503b94 do not show availability dates in shop index 2016-06-01 18:42:26 +02:00
Víðir Valberg Guðmundsson 8369c6b38a Adding TICKET_CATEGORY_ID again 2016-06-01 17:51:25 +02:00
Thomas Steen Rasmussen 761b06941f disable for now 2016-06-01 17:36:42 +02:00
Thomas Steen Rasmussen ef286bbba1 disable epay stuff for now 2016-06-01 17:22:44 +02:00
Thomas Steen Rasmussen 69ec336eb0 Merge pull request #35 from bornhack/feature/tickets
Feature/tickets
2016-06-01 17:19:48 +02:00
Thomas Steen Rasmussen 811fbf702b add 404 and 500 templates 2016-06-01 16:56:50 +02:00
Thomas Steen Rasmussen 39f075e2a3 fix formatting on bank transfer page 2016-06-01 16:51:13 +02:00
Thomas Steen Rasmussen 080b45244b forgot to add danish bank account info to settings 2016-06-01 16:48:42 +02:00
Víðir Valberg Guðmundsson ebd6147d86 Go back to just listing Profile in menu 2016-06-01 16:20:47 +02:00
Thomas Steen Rasmussen 96f9c34783 remove questionaire button until we get that part fixed 2016-06-01 15:54:57 +02:00
Thomas Steen Rasmussen ede9596931 disable card payments until we get the final legal stuff sorted 2016-06-01 15:51:54 +02:00
Thomas Steen Rasmussen 34ebf79e03 maybe set the correct setting 2016-06-01 15:46:14 +02:00
Thomas Steen Rasmussen 06affe4de6 redirect to shop after login 2016-06-01 15:41:28 +02:00
Thomas Steen Rasmussen 9661a2cca3 fix a few things in profile 2016-06-01 15:37:08 +02:00
Thomas Steen Rasmussen 01a6ddff0f typo 2016-06-01 15:36:55 +02:00
Thomas Steen Rasmussen 990b8947fd show username in menu when logged in 2016-06-01 15:36:50 +02:00
Thomas Steen Rasmussen 9102796e6e only check if terms are checked when payment method buttons are used 2016-06-01 15:27:33 +02:00