Commit graph

805 commits

Author SHA1 Message Date
Thomas Steen Rasmussen ce7d34e8ab a few more changes to order_detail.html template, and import fixed py3 version of coinify api 2017-03-24 03:01:18 +01:00
Thomas Steen Rasmussen e1cf75d201 remove submodule 2017-03-24 02:06:07 +01:00
Thomas Steen Rasmussen 5ef381f973 move coinify vendor stuff to a submodule 2017-03-24 01:58:04 +01:00
Thomas Steen Rasmussen 8956c5300f change dates and fix a few bugs in bootstrap script 2017-03-24 01:55:36 +01:00
Thomas Steen Rasmussen 8202d3fdb1 fixup the order detail page a bit 2017-03-24 01:55:09 +01:00
Thomas Steen Rasmussen d4a180e29e update all submodules 2017-03-24 01:00:38 +01:00
Thomas Steen Rasmussen eac9cbfa1e permit blank 2017-03-23 20:21:19 +01:00
Thomas Steen Rasmussen 171553677c fixup logging 2017-03-23 18:32:13 +01:00
Thomas Steen Rasmussen 4f61a95d83 refactor invoiceworker to be run by uwsgi, support graceful shutdown, and support reloading code without exiting 2017-03-21 13:35:00 +01:00
Thomas Steen Rasmussen bd93e0c2ea remove PDF_LETTERHEAD_FILENAME from environment_settings.py.dist 2017-03-20 18:39:44 +01:00
Thomas Steen Rasmussen f6637a77bc Merge branch 'master' of github.com:bornhack/bornhack-website 2017-03-19 23:08:46 +01:00
Thomas Steen Rasmussen 77141e7931 fixup bootstrap script, make Product.slug unique 2017-03-19 23:08:36 +01:00
Stephan Telling 2c28e22f34
move fa-select css to bornhack.css 2017-03-19 18:13:38 +01:00
Thomas Steen Rasmussen e95cc5ea93 add EnsureWritableCampMixin to villages 2017-03-18 16:54:23 +01:00
Thomas Steen Rasmussen 66f7b7ec2e fix CFS open mixin 2017-03-18 16:33:48 +01:00
Thomas Steen Rasmussen dd23490c01 add mixin to prevent adding and editing user submitted speaker and event proposals 2017-03-18 16:22:16 +01:00
Thomas Steen Rasmussen 5bc4edf991 deny changes to Speaker and Event proposals when call for speakers for the camp is not open 2017-03-18 16:19:40 +01:00
Thomas Steen Rasmussen 027e89e4ab super() in py3 2017-03-18 16:03:10 +01:00
Víðir Valberg Guðmundsson 62381a50e6 Make camp and slug unique together on villages. Also fix some url errors. 2017-03-18 15:38:12 +01:00
Thomas Steen Rasmussen b151192d02 refactor some of the common image code into a PictureViewMixin, and make pictures work with the devserver 2017-03-17 19:40:47 +01:00
Thomas Steen Rasmussen c532dac146 right align 'manage proposals' button 2017-03-17 17:58:29 +01:00
Thomas Steen Rasmussen a715cba597 add admin commands to approve speaker and event proposals 2017-03-16 00:30:59 +01:00
Thomas Steen Rasmussen c2528129a5 show headline, use badges 2017-03-15 22:58:54 +01:00
Thomas Steen Rasmussen 9997897160 a bit more work on location icons 2017-03-15 21:54:57 +01:00
Thomas Steen Rasmussen 2515c08d97 add planet icon for all locations 2017-03-14 23:32:40 +01:00
Thomas Steen Rasmussen 3d5c9a9508 add help text for icon field 2017-03-14 23:25:37 +01:00
Thomas Steen Rasmussen 9632cc3ec7 add icon unicode hex for eventlocations in bootstrap script 2017-03-14 23:24:05 +01:00
Stephan Telling 2a78b70171 Merge branch 'master' of github.com:bornhack/bornhack-website 2017-03-14 22:17:09 +01:00
Stephan Telling 8ddf21ba48
add fontawesome and begin work on adding icons on schedule
Also deletes an old 2016 info html page and removes tabs in
bornhack-2016_camp_detail.html
2017-03-14 22:14:37 +01:00
Thomas Steen Rasmussen 9f44c0f300 fix speaker proposal image upload stuff, maybe 2017-03-14 21:45:12 +01:00
Thomas Steen Rasmussen d159844750 fix user check 2017-03-14 18:06:23 +01:00
Thomas Steen Rasmussen e316ebbb44 typo 2017-03-14 17:37:44 +01:00
Thomas Steen Rasmussen 181a0e43b0 add some more speaker and event proposal submission stuff 2017-03-12 20:54:33 +01:00
Thomas Steen Rasmussen a8e81dbc6f rename mixin 2017-03-12 19:34:27 +01:00
Thomas Steen Rasmussen 52a70b1ee2 Merge branch 'master' of github.com:bornhack/bornhack-website 2017-03-12 19:07:22 +01:00
Thomas Steen Rasmussen a51b795bce rename models and views from submission to proposal 2017-03-12 19:06:03 +01:00
Stephan Telling 9125edc21f
add missing < in speaker_deatil.html 2017-03-12 16:56:04 +01:00
Stephan Telling 89bec82880
2016 camp readonly and public event types in bootstrap script 2017-03-12 16:54:00 +01:00
Thomas Steen Rasmussen 9dfa4f98e9 disable delete buttons 2017-03-12 16:30:55 +01:00
Thomas Steen Rasmussen 8598ddc2f7 add eventsubmission detail page and a few missing buttons 2017-03-12 16:27:37 +01:00
Thomas Steen Rasmussen 2148d1c542 a few more proposal submission fixes 2017-03-12 16:16:24 +01:00
Thomas Steen Rasmussen 18e50d5e85 typo 2017-03-12 15:52:24 +01:00
Thomas Steen Rasmussen ad3b826844 rework speaker and talk proposal stuff 2017-03-12 15:43:41 +01:00
Thomas Steen Rasmussen 1162a72627 add help_text for speaker fields 2017-03-11 12:12:07 +01:00
Thomas Steen Rasmussen d799240dae add is_public property to UserSubmittedModel and permit showing non-approved speakers in list and detail only to the owner user when logged in 2017-03-10 00:45:50 +01:00
Thomas Steen Rasmussen c7571ed9a3 add django-extensions 2017-03-10 00:07:13 +01:00
Thomas Steen Rasmussen b90566879d add ipython to requirements 2017-03-10 00:04:05 +01:00
Thomas Steen Rasmussen 9a8b552915 add name for the redirect urls 2017-03-10 00:01:14 +01:00
Thomas Steen Rasmussen 950ae4f2dc redirect to frontpage after login 2017-03-10 00:01:02 +01:00
Stephan Telling dc45460675
fix verification of admin user in bootstrap script 2017-03-08 23:51:43 +01:00