Commit graph

23 commits

Author SHA1 Message Date
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
Thomas Steen Rasmussen 5e1d9f009e add LETTERHEAD_PDF_PATH to settings 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
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
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 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 fd64742b17 Revamping profile pages 2016-02-20 23:39:02 +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 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
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