Thomas Steen Rasmussen
|
484c864417
|
Merge branch 'ysangkok-master'
|
2017-03-31 19:26:08 +02:00 |
|
|
Thomas Steen Rasmussen
|
3cc2f21bfb
|
hand merge and commit PR #76
|
2017-03-31 19:25:48 +02:00 |
|
|
Thomas Steen Rasmussen
|
206e68b2e9
|
manually merge PR #78
|
2017-03-31 18:41:17 +02:00 |
|
 Víðir Valberg Guðmundsson
|
5d4c4952d5
|
Teams (#100)
* Initial model for volunteers app.
* Rename Volunteers to Teams. Add view and templates.
* Adding detail page.
|
2017-03-31 17:29:28 +02:00 |
|
|
Thomas Steen Rasmussen
|
9d75bb6d9d
|
make it easier to distinguish villaged
|
2017-03-30 09:36:47 +02:00 |
|
|
Thomas Steen Rasmussen
|
ff76c3e98e
|
add missing dependency to README
|
2017-03-30 09:36:29 +02:00 |
|
|
Thomas Steen Rasmussen
|
9e3ed81731
|
fix pictures
|
2017-03-30 00:20:14 +02:00 |
|
|
Thomas Steen Rasmussen
|
c11979083c
|
fix ansible variable for invoice letterhead pdf
|
2017-03-30 00:19:34 +02:00 |
|
|
Thomas Steen Rasmussen
|
dba34531ba
|
quoting
|
2017-03-28 10:13:15 +02:00 |
|
|
Thomas Steen Rasmussen
|
4e865d146e
|
add wkhtmltopdf path to environment_settings.py.dist
|
2017-03-28 10:10:27 +02:00 |
|
|
Thomas Steen Rasmussen
|
3bed6c25b8
|
initialise logger inside class so __name__ tells us where we are
|
2017-03-28 09:17:29 +02:00 |
|
|
Thomas Steen Rasmussen
|
70b6a51c5c
|
fix comment
|
2017-03-28 09:17:08 +02:00 |
|
|
Thomas Steen Rasmussen
|
529be396f4
|
fixup the shop to work in the new multicamp world, fix pdf generation, add new letterhead templates, rework invoiceworker into a generic worker runner
|
2017-03-28 00:12:11 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
69e475f854
|
Fix program view on mobile.
|
2017-03-27 21:24:56 +02:00 |
|
Stephan Telling
|
b4bfd82174
|
remove print from shop_tags.py
|
2017-03-27 18:12:59 +02:00 |
|
|
Thomas Steen Rasmussen
|
489cc2f55f
|
Merge branch 'master' of github.com:bornhack/bornhack-website
|
2017-03-26 15:05:39 +02:00 |
|
|
Thomas Steen Rasmussen
|
cbd6457947
|
fixup the event list a bit, fixes #90
|
2017-03-26 15:05:29 +02:00 |
|
|
Stephan Telling
|
079ea6b2b8
|
add rough euro prices to the shop. fix #32
|
2017-03-26 13:57:00 +02:00 |
|
|
Thomas Steen Rasmussen
|
850de5554f
|
fix customer comment error when changing payment method for an order with empty comment
|
2017-03-26 10:15:54 +02:00 |
|
|
Thomas Steen Rasmussen
|
25aba076fb
|
add info on cloning with --recursive to README
|
2017-03-26 09:56:13 +02:00 |
|
|
Thomas Steen Rasmussen
|
27e5fcc407
|
a few more changes to order_detail.html template, and import fixed py3 version of coinify api
|
2017-03-24 03:01:28 +01:00 |
|
|
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 |
|