reynir/bornhack-website
1
0
Fork 0
Code Issues Pull requests 1 Releases Wiki Activity
524 commits 2 branches 0 tags 164 MiB
Commit graph

173 commits

Author SHA1 Message Date
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
Víðir Valberg Guðmundsson 869f5a8fe9 A lot of ticketing stuff. 2016-05-06 23:31:56 +02:00
Víðir Valberg Guðmundsson e258db6546 Fix formatting. 2016-05-06 23:30:07 +02:00
Víðir Valberg Guðmundsson 612b1820cb Do NOT rely on javascript from CDN's. 2016-05-06 22:51:07 +02:00
Víðir Valberg Guðmundsson 41064e3968 Fixing menu responsiveness. 2016-05-06 17:12:41 +02:00
Thomas Steen Rasmussen 4ecc033bd9 add from email 2016-05-02 22:47:37 +02:00
Thomas Steen Rasmussen 3d22c7374b move email settings 2016-05-02 22:38:49 +02:00
Thomas Steen Rasmussen 8d3ad2d0fb add email settings 2016-05-02 22:35:56 +02:00
Thomas Steen Rasmussen c5fa7ef87e include sample email settings in .env.dist 2016-05-02 22:13:47 +02:00
Víðir Valberg Guðmundsson ec95879e5a Mention the twitter account and make p tags lead again. 2016-05-01 20:14:26 +02:00
Jonty Wareing 1c330e57a1 Slightly better english & spelling corrections 2016-04-28 10:27:42 +01:00
Víðir Valberg Guðmundsson 266b865b1a Use https for links in allauth mails. 2016-04-25 19:08:55 +02:00
Víðir Valberg Guðmundsson 2923372488 Adding tickets app, removing signup from camps app, setting dev db to postgres. 2016-04-22 22:38:44 +02:00
Víðir Valberg Guðmundsson 39ad0b82fc Fixing some allauth templates and removing wiki from the menu. 2016-04-22 21:55:16 +02:00
Ronni Elken Lindsgaard 8292a738ee Something about buying food 2016-04-03 12:40:06 +02:00
Ronni Elken Lindsgaard a7242f0256 Added some good to knows 2016-04-03 00:35:30 +02:00
Víðir Valberg Guðmundsson c5236aa891 Update django-bootstrap3 and use the bootstrap_javascript. 2016-04-02 21:16:46 +02:00
Víðir Valberg Guðmundsson 0dd02cefb7 Doing a Good to know page. 2016-02-21 02:04:51 +01:00
Víðir Valberg Guðmundsson fd64742b17 Revamping profile pages 2016-02-20 23:39:02 +01:00
Víðir Valberg Guðmundsson 9f2ce9d7c5 Adding profile update functionality 2016-02-20 05:18:12 +01:00
Víðir Valberg Guðmundsson 1de0b1ad0e Signup about done. Also enabled apps again. 2016-02-20 03:00:08 +01:00
Víðir Valberg Guðmundsson 0d96243876 Some more of that fancy responsiveness 2016-02-20 01:33:57 +01:00
Víðir Valberg Guðmundsson 287bc02fca Did a new design. Now for some functionality. 2016-02-20 00:29:43 +01:00
Víðir Valberg Guðmundsson 2cd6d12060 Somethings funky with this image. Removing and adding. 2016-02-13 19:38:43 +01:00
Víðir Valberg Guðmundsson 292037c5d6 Somethings funky with this image. Removing and adding. 2016-02-13 19:35:54 +01:00
Víðir Valberg Guðmundsson 3bce1259ce Change logo to png for broader support. 2016-02-13 17:25:57 +01:00
Thomas Steen Rasmussen 819cfc016f fix settings path 2016-02-13 16:28:41 +01:00
Alexander Færøy b367a6b983
Dot. 2016-02-11 22:51:35 +01:00
Alexander Færøy dd8479a9e0
More rephrasing. 2016-02-11 22:49:58 +01:00
Alexander Færøy 311e9c76a3
More rephrasing. 2016-02-11 22:43:59 +01:00
Alexander Færøy 4f423f83c1
Rephrasing. 2016-02-11 22:39:40 +01:00
Alexander Færøy 4afb5ddafe
Use irc.baconsvin.org. 2016-02-11 22:31:28 +01:00
Alexander Færøy dc9d9b5d73
Use "Lucida Console", Monaco, monospace instead of Hack. 2016-02-11 21:11:18 +01:00
Víðir Valberg Guðmundsson a1cb8f179a Making text into paths. 2016-02-09 10:26:47 +01:00
Víðir Valberg Guðmundsson 573a90fe74 Frontend stuff (hack font etc.) 2016-02-08 23:37:26 +01:00
Víðir Valberg Guðmundsson 36674c3244 Adding logo (and playground svg) to the mix. 2016-02-08 23:25:16 +01:00
Víðir Valberg Guðmundsson d9c95433e9 Disable debug toolbar from development - breaks somehow. 2016-02-08 22:45:56 +01:00
Víðir Valberg Guðmundsson d91898ff73 - Upgrading to django 1.9.x 
- Disabling apps for now
- Fix some frontpage text
- Add env.dist for an .env example
- Adjust django-environ setup
- Add vim swap files to gitignore
 2016-02-08 22:45:56 +01:00
Thomas Steen Rasmussen b06174fb6e hardcode production settings for now 2016-02-08 22:12:27 +01:00
Víðir Valberg Guðmundsson d239934fe7 Setup allauth and done some frontend stuff with bootstrap. 2015-10-05 18:35:30 +02:00
Víðir Valberg Guðmundsson 91ca821831 Initial commit. 2015-10-03 03:07:05 +02:00