Thomas Steen Rasmussen
|
b72cf60419
|
Merge pull request #80 from bornhack/multicamp
Finally merge multicamp support
|
2017-01-25 19:38:42 +01:00 |
|
Thomas Steen Rasmussen
|
8b3313db9c
|
remove debug output
|
2017-01-25 17:46:58 +01:00 |
|
|
Thomas Steen Rasmussen
|
e224ce90cf
|
more small fixes, add camp list
|
2017-01-25 01:49:13 +01:00 |
|
|
Thomas Steen Rasmussen
|
c48c66635c
|
a bit more work on speakers and schedule and sponsors and stuff
|
2017-01-25 00:24:04 +01:00 |
|
|
Thomas Steen Rasmussen
|
edc37243e3
|
fix call for speakers
|
2017-01-24 16:42:57 +01:00 |
|
|
Thomas Steen Rasmussen
|
1908c18530
|
more fiddling with schedule layout
|
2017-01-23 23:58:41 +01:00 |
|
|
Thomas Steen Rasmussen
|
201de12b49
|
more program and schedule changes
|
2017-01-23 18:57:30 +01:00 |
|
|
Thomas Steen Rasmussen
|
518611534e
|
commit before start of work sunday, mostly fixing schedule stuff, including setting settings.TIME_ZONE properly, this means we will need to convert production data times to be UTC
|
2017-01-22 12:59:57 +01:00 |
|
|
Thomas Steen Rasmussen
|
125d433860
|
get the right number of 9s for html5lib so bleach doesn't crap out, see https://github.com/mozilla/bleach/issues/212 and https://github.com/mozilla/bleach/issues/212
|
2017-01-20 19:35:10 +01:00 |
|
|
Thomas Steen Rasmussen
|
ad0aaa6748
|
fix bootstrap-devsite somewhat
|
2017-01-20 18:14:08 +01:00 |
|
|
Thomas Steen Rasmussen
|
73c7f0374a
|
updated requirements.txt
|
2017-01-20 17:47:50 +01:00 |
|
|
Thomas Steen Rasmussen
|
3125195554
|
update README
|
2017-01-20 17:47:10 +01:00 |
|
|
Thomas Steen Rasmussen
|
b4f3c386c3
|
just a commit before we start the days work
|
2017-01-20 16:18:10 +01:00 |
|
|
Thomas Steen Rasmussen
|
9b089de165
|
proof that I did something during 33c3
|
2016-12-29 00:15:13 +01:00 |
|
|
Thomas Steen Rasmussen
|
f8a513ec72
|
this is the beginning of multicamp support, much work still to be done
|
2016-12-25 15:52:55 +01:00 |
|
|
Thomas Steen Rasmussen
|
d54bd2a84f
|
remove makefile
|
2016-11-22 21:45:15 +01:00 |
|
|
Thomas Steen Rasmussen
|
3049ed2665
|
remove unused graphics/ folder
|
2016-11-22 21:43:54 +01:00 |
|
|
Thomas Steen Rasmussen
|
820000ca83
|
make settings, env settings, and requirements less complex
|
2016-11-22 21:04:06 +01:00 |
|
|
Thomas Steen Rasmussen
|
6ca19b6358
|
update headline text
|
2016-11-10 02:02:02 +01:00 |
|
|
Thomas Steen Rasmussen
|
6e10d0e427
|
update placeholder text in customer_comment textfield
|
2016-11-10 01:59:37 +01:00 |
|
|
Thomas Steen Rasmussen
|
0782157de2
|
update terms checkbox text to reflect merchandise shipping terms
|
2016-11-10 01:55:58 +01:00 |
|
|
Thomas Steen Rasmussen
|
79cbc4fe55
|
disable credit card payment for now
|
2016-11-09 23:56:44 +01:00 |
|
|
Thomas Steen Rasmussen
|
d0a0623315
|
only include products when their category is public
|
2016-11-09 23:02:14 +01:00 |
|
|
Thomas Steen Rasmussen
|
9bec5f1d37
|
make manager show products
|
2016-11-09 20:38:21 +01:00 |
|
|
Thomas Steen Rasmussen
|
ffbbf8f869
|
only show comment when one was entered, after order is closed
|
2016-11-09 17:04:03 +01:00 |
|
|
Thomas Steen Rasmussen
|
ddaf7d0d2d
|
add flickr, instagram to contact page, update text on frontpage
|
2016-11-09 16:43:06 +01:00 |
|
|
Thomas Steen Rasmussen
|
4d6e397ea9
|
move ADMINS back to base.py
|
2016-11-09 16:02:17 +01:00 |
|
|
Thomas Steen Rasmussen
|
a691a0d0b4
|
add comment to orders
|
2016-11-09 14:34:55 +01:00 |
|
|
Thomas Steen Rasmussen
|
741ae97c91
|
reorder some stuff
|
2016-11-09 12:28:34 +01:00 |
|
|
Thomas Steen Rasmussen
|
4dd2325926
|
add cash payment
|
2016-11-09 12:27:42 +01:00 |
|
|
Thomas Steen Rasmussen
|
b2cf4cf9ae
|
rework settings stuff, README, env files
|
2016-11-09 09:55:15 +01:00 |
|
|
Thomas Steen Rasmussen
|
eb3f685938
|
ignore venv
|
2016-11-08 08:30:41 +01:00 |
|
 Víðir Valberg Guðmundsson
|
8aef2064e6
|
Merge pull request #75 from benjaoming/dev-improvements
Dev improvements
|
2016-08-31 14:10:21 +02:00 |
|
Benjamin Bach
|
3800b7daa4
|
Note to self: Don't assume you know, know that you know, then inform others
|
2016-08-30 11:37:38 +02:00 |
|
|
Benjamin Bach
|
e5963cc2e6
|
Remove out-dated env template
|
2016-08-30 11:33:13 +02:00 |
|
|
Benjamin Bach
|
e0e5d646f6
|
Fix illegal TICKET_CATEGORY_ID uuid in dev settings
|
2016-08-29 20:59:28 +02:00 |
|
|
Benjamin Bach
|
ef29e038b5
|
Improve the dev commands and add SQLite support
|
2016-08-29 20:43:50 +02:00 |
|
Ronni Elken Lindsgaard
|
78d84b21f9
|
Whitespace
|
2016-08-29 16:58:50 +02:00 |
|
|
Ronni Elken Lindsgaard
|
c9c2651bb9
|
Update bakery information
|
2016-08-29 16:58:50 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
007ae997cb
|
Raise the exception, not return it.
|
2016-08-29 16:17:18 +02:00 |
|
|
Benjamin Bach
|
c9803b22c2
|
use development settings in dev.sh
|
2016-08-28 17:32:34 +02:00 |
|
|
Benjamin Bach
|
8d329eb716
|
Fix migrations and create a developer script that sets necessary minimal env
|
2016-08-28 17:32:34 +02:00 |
|
|
Ronni Elken Lindsgaard
|
0af442e131
|
Infopage update
|
2016-08-28 16:38:55 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
c68718f8c0
|
Adding filtering by checked_in
|
2016-08-27 12:29:51 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
87c9254d1f
|
Be able to filter by product
|
2016-08-27 10:40:57 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
d0c7484370
|
Adding users email
|
2016-08-27 10:29:26 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
370e9b6d32
|
Add checked_in to tickets and make it possible to mark tickets as arrived.
|
2016-08-27 10:17:43 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
029ec74389
|
Don't show non-active products. Also don't show categories which doesn't have any active products.
|
2016-08-25 12:04:47 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
77422417ec
|
Fix products not available for purchased anymore
|
2016-08-25 00:11:01 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
ffb7fb38e4
|
Fix small "mismatch" about lightning talks
|
2016-08-25 00:11:01 +02:00 |
|