Commit graph

190 commits

Author SHA1 Message Date
Thomas Steen Rasmussen 22fa341f59 replace prosa u35 logo, more sponsors page styling 2016-08-04 22:52:16 +02:00
Thomas Steen Rasmussen e3db625ba3 add more sponsors, move stuff around on sponsors page 2016-08-04 22:43:24 +02:00
Víðir Valberg Guðmundsson b355cc4796 Merge pull request #66 from Telling/map-fix
Moved coords and address to popup on marker. Wrap old in noscript
2016-08-04 18:02:10 +02:00
Víðir Valberg Guðmundsson b57a4ff009 Fix #65 2016-08-04 17:19:34 +02:00
Stephan Telling fc5c57eb7f Moved coords and address to popup on marker. Wrap old in noscript 2016-08-04 17:17:16 +02:00
Thomas Steen Rasmussen 3c19ae2bf0 switch two images 2016-08-04 17:17:05 +02:00
Thomas Steen Rasmussen 18a9ae2786 typo 2016-08-03 14:06:46 +02:00
Thomas Steen Rasmussen 6968546c33 add title to <img> tags on frontpage 2016-08-03 14:04:11 +02:00
Thomas Steen Rasmussen 3f2a4e7b9d remove a picture so number of pictures is divisible by three 2016-08-03 13:47:21 +02:00
Thomas Steen Rasmussen d24d634973 center align images at the botton of the frontpage 2016-08-03 01:17:47 +02:00
Thomas Steen Rasmussen 35e04f344b more pictures around a bit, remove duplicate 2016-08-03 01:15:42 +02:00
Thomas Steen Rasmussen f6c56ff83d use thumbnail for thumbnail 2016-08-03 01:01:13 +02:00
Thomas Steen Rasmussen 69ca2a2202 fix case of file extensions 2016-08-03 00:55:57 +02:00
Thomas Steen Rasmussen 052757883e change frontpage pictures to some of our own from previous event 2016-08-03 00:51:34 +02:00
Víðir Valberg Guðmundsson 0bc64a7d6d Styling images on frontpage a bit 2016-07-28 12:44:26 +02:00
Thomas Steen Rasmussen f387c0a394 first attempt at adding some pictures to the frontpage 2016-07-26 20:14:03 +02:00
Thomas Steen Rasmussen 7b57ae69d4 ...even more sponsors page styling 2016-07-19 09:59:22 +02:00
Thomas Steen Rasmussen 2a6c5d2a4e more styling of sponsors page 2016-07-19 09:57:29 +02:00
Thomas Steen Rasmussen 48562a5161 more work on sponsors page 2016-07-19 09:53:09 +02:00
Thomas Steen Rasmussen 0b1ab88e1b missing "import" 2016-07-19 09:24:04 +02:00
Thomas Steen Rasmussen 1f2dffbc3b add dkuug to sponsors page, add logos for sponsors 2016-07-19 09:21:03 +02:00
Víðir Valberg Guðmundsson 3cf837e8e9 Getting first view up and running. 2016-07-13 22:37:20 +02:00
Víðir Valberg Guðmundsson 5c00934027 Resolve merge conflict. 2016-07-13 21:44:09 +02:00
Víðir Valberg Guðmundsson bd089d03d3 Add note about not having to have a village or a concept to rent a tent 2016-07-10 20:14:00 +02:00
Víðir Valberg Guðmundsson 25570632b2 Updating info about villages. Styling buttons in the village CRUD. 2016-07-10 20:06:08 +02:00
Víðir Valberg Guðmundsson 8786b5af88 Initial villages feature 2016-07-05 23:43:18 +02:00
Víðir Valberg Guðmundsson fe0bc14ac1 Adding content to <title>. Fix #62 2016-07-05 18:46:32 +02:00
Víðir Valberg Guðmundsson add35068af Improving the setup process a bit. 2016-07-03 14:27:31 +02:00
Víðir Valberg Guðmundsson fb58ede246 Fix casing 2016-06-27 23:53:24 +02:00
Víðir Valberg Guðmundsson fafdde8003 Duplicate of Twitter. 2016-06-27 23:53:24 +02:00
Víðir Valberg Guðmundsson 3aa0f9d8a3 Add link to Facebook and extract contact info into an include 2016-06-27 23:53:24 +02:00
Thomas Steen Rasmussen 6347a3ba98 reactivate epay 2016-06-14 09:24:07 +02:00
Thomas Steen Rasmussen fde3317829 update sponsors page 2016-06-13 23:20:57 +02:00
Ronni Elken Lindsgaard b7aabf5f56 Better line lengths 2016-06-09 19:20:47 +02:00
Ronni Elken Lindsgaard aef743d9dc WIP sponsor page 2016-06-09 18:58:17 +02:00
Thomas Steen Rasmussen 85d6499667 add info on fees to t&c 2016-06-09 13:05:19 +02:00
Víðir Valberg Guðmundsson fba2165a64 Some menu-squeezing 2016-06-07 09:40:30 +02:00
Thomas Steen Rasmussen fa6120e2ab make logo evenfucking smaller 2016-06-07 09:26:44 +02:00
Thomas Steen Rasmussen 6c771898dc add speakers and sponsors info 2016-06-07 00:08:30 +02:00
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 628488c1dc spelling, and add payment info to kiosk info 2016-06-04 10:13:38 +02:00
Víðir Valberg Guðmundsson 641201a856 Fix #43 2016-06-03 21:36:45 +02:00
Thomas Steen Rasmussen cf3b4dee8b add tent info 2016-06-02 10:36:03 +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 811fbf702b add 404 and 500 templates 2016-06-01 16:56:50 +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 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 990b8947fd show username in menu when logged in 2016-06-01 15:36:50 +02:00
Thomas Steen Rasmussen cfd3c0d95b move some stuff around 2016-06-01 14:19:00 +02:00
Thomas Steen Rasmussen 79fb937e86 there is no law 2016-06-01 14:12:50 +02:00
Thomas Steen Rasmussen d5221f9630 damn url namespaces get me every time lol 2016-06-01 14:10:33 +02:00
Thomas Steen Rasmussen e2e1bb4946 these go here 2016-06-01 14:08:24 +02:00
Thomas Steen Rasmussen f108317031 styling legal stuff 2016-06-01 14:05:11 +02:00
Thomas Steen Rasmussen e3e72cd6a8 add a metric fuckton of legal stuff 2016-06-01 14:01:27 +02:00
Thomas Steen Rasmussen 7acf2e5acd add danish bank account 2016-06-01 12:50:12 +02:00
Thomas Steen Rasmussen 7eae1b79ec add more info to the info page 2016-06-01 11:08:55 +02:00
Thomas Steen Rasmussen 63936fbcdb add more text to info page, rename to info, other small text changes 2016-06-01 10:44:23 +02:00
Thomas Steen Rasmussen 3a73c96dd8 add bankaccount 2016-06-01 09:29:21 +02:00
Víðir Valberg Guðmundsson fc8164b17a Shining up the contact page 2016-05-31 21:51:07 +02:00
Thomas Steen Rasmussen 65a5da2177 add coinify_ipn_secret 2016-05-31 20:47:23 +02:00
Víðir Valberg Guðmundsson aa3a3c0428 List and display tickets (close #6) 2016-05-31 00:58:50 +02:00
Víðir Valberg Guðmundsson a4b578642d Adding Commonmark and a template tag for that. We're going to use it in the shop app as well, so it's in its own app now (utils). 2016-05-30 21:52:01 +02:00
Víðir Valberg Guðmundsson e8bda33ac3 Adding News app! 2016-05-30 21:36:38 +02:00
Víðir Valberg Guðmundsson 8737c2f8ad Adding breadcrumbs 2016-05-30 20:56:16 +02:00
Thomas Steen Rasmussen 5cf5750e1b accidently removed pdf archive path from settings 2016-05-30 20:35:48 +02:00
Thomas Steen Rasmussen ac4444f070 add MEDIA_ROOT to base.py 2016-05-30 20:22:47 +02:00
Thomas Steen Rasmussen a91ed3bc5c working on invoice upload stuff 2016-05-30 20:15:39 +02:00
Víðir Valberg Guðmundsson c214036c51 Doing previous orders button a bit more prominent 2016-05-30 19:27:03 +02:00
Thomas Steen Rasmussen e9adcdd1cf move PDF letterhead path to env 2016-05-30 18:49:53 +02:00
Víðir Valberg Guðmundsson d12ab4444a Fix #16 2016-05-30 18:29:44 +02:00
Víðir Valberg Guðmundsson 2dd8d38d35 Fix #13 and #15 2016-05-30 18:23:19 +02:00
Víðir Valberg Guðmundsson 34fb9537c3 Bump the product box to 350px in height. 2016-05-30 18:23:19 +02:00
Thomas Steen Rasmussen 20ab3eb5d9 typo 2016-05-30 18:21:43 +02:00
Víðir Valberg Guðmundsson 02edd45b20 Fix #8 and layout of products 2016-05-30 18:03:54 +02:00
Thomas Steen Rasmussen 935af5f188 commit a bunch of invoice related stuff - generate pdf invoice, save to archive, email to customer 2016-05-30 16:58:55 +02:00
Thomas Steen Rasmussen 7c24f93751 whitespace matters 2016-05-29 11:30:24 +02:00
Thomas Steen Rasmussen b97fcfc115 add coinify credentials to settings 2016-05-29 10:55:55 +02:00
Thomas Steen Rasmussen 6016a6b605 Merge remote-tracking branch 'origin/feature/tickets' into feature/tickets
# Conflicts:
#	shop/models.py
#	shop/urls.py
2016-05-25 22:53:02 +02:00
Thomas Steen Rasmussen 9387b8bdc4 working on coinify payments 2016-05-25 22:48:02 +02:00
Víðir Valberg Guðmundsson c0045177aa Marking an Order as paid should generate Tickets 2016-05-25 20:05:31 +02:00
Víðir Valberg Guðmundsson 35e1f68eae Boilerplate for law required stuff. 2016-05-19 11:20:20 +02:00
Thomas Steen Rasmussen 5e1d9f009e add LETTERHEAD_PDF_PATH to settings 2016-05-16 21:04:01 +02:00
Thomas Steen Rasmussen 1abbf3acc6 add pdf code and pdf letterheads 2016-05-16 21:04:01 +02:00
Víðir Valberg Guðmundsson 326e9d70cd Adding cart with number of items in order to menu 2016-05-14 19:42:25 +02:00
Thomas Steen Rasmussen b942d674ef more work on shop 2016-05-13 08:36:56 +02:00
Víðir Valberg Guðmundsson 5cfcf13e7d We don't only operate on tickets - renaming and refactoring accordingly 2016-05-10 22:20:01 +02:00
Víðir Valberg Guðmundsson bbaf3ea964 Adding initial Epay integration - far from done. 2016-05-10 17:55:54 +02:00
Víðir Valberg Guðmundsson 2cc5a0512f Adding logging to sysadm@bornhack.org 2016-05-07 11:28:24 +02:00