Stephan Telling
|
1f4df68304
|
add outgoingemail model, add mailhelper function and worker
|
2017-04-23 22:04:58 +02:00 |
|
|
Stephan Telling
|
698698a96b
|
update bootstrap script with orders and orderproductrelations
|
2017-04-23 21:45:35 +02:00 |
|
Thomas Steen Rasmussen
|
5c4487d513
|
send email to team responsibles, not to the person joining the team
|
2017-04-22 00:23:12 +02:00 |
|
 Víðir Valberg Guðmundsson
|
30c56afb83
|
Small esthetic fix.
|
2017-04-21 19:13:44 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
13631eac93
|
Now also mark the filters accordingly to URL.
|
2017-04-21 19:09:46 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
0dc10d3f95
|
Support parameters in the URL again.
|
2017-04-21 18:33:25 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
60cf09b172
|
Making checkboxes more nice.
|
2017-04-21 15:02:20 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
9fb372e114
|
Highlight "All days" when selected
|
2017-04-21 14:07:39 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
3122092326
|
All filters should be checked on start.
|
2017-04-21 11:28:22 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
e36eb17ac8
|
Removing all those console.log's
|
2017-04-21 01:37:43 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
9071a9c524
|
Revamping filtering big time!
|
2017-04-21 01:34:22 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
691c6533c3
|
Fix bornhack 2016 logo.
|
2017-04-20 10:02:25 +02:00 |
|
|
Thomas Steen Rasmussen
|
1b8d17e77f
|
forgot to change a place
|
2017-04-20 00:49:36 +02:00 |
|
|
Thomas Steen Rasmussen
|
f62f91d0c3
|
change admin action to approve membership
|
2017-04-20 00:46:40 +02:00 |
|
|
Thomas Steen Rasmussen
|
9fd05583f4
|
fix some spacing around imaged on 2017 frontpage
|
2017-04-20 00:20:46 +02:00 |
|
|
Thomas Steen Rasmussen
|
a3437bf1d0
|
add one more picture to the 2017 frontpage
|
2017-04-20 00:05:13 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
70b853b669
|
Remove channel panel.
|
2017-04-19 23:53:43 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
3ba47f95bc
|
Also use svg for non-camp logo.
|
2017-04-19 23:46:48 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
01a8958153
|
Make logo clickable again.
|
2017-04-19 23:45:01 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
21fabac47a
|
Adding some highlight to events in day view.
|
2017-04-19 23:37:14 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
f5018613f0
|
Fixing overview.
|
2017-04-19 23:15:06 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
f7749adb23
|
Adding modals and websockets to day view.
|
2017-04-19 22:37:30 +02:00 |
|
 Kasper Friis Christensen
|
370ea8ada1
|
Converted text to outline
|
2017-04-19 21:12:56 +02:00 |
|
|
Kasper Friis Christensen
|
8e1a8de9aa
|
Beautified dropdown
|
2017-04-19 21:12:56 +02:00 |
|
|
Kasper Friis Christensen
|
5043b07188
|
Corrected tagline font in logo
|
2017-04-19 21:12:56 +02:00 |
|
|
Kasper Friis Christensen
|
f4dd5fff94
|
Updated logo pngs and updated logos to svg and png fallback
|
2017-04-19 21:12:56 +02:00 |
|
|
Kasper Friis Christensen
|
f45c7a3b73
|
Centered footer on desktop
|
2017-04-19 21:12:56 +02:00 |
|
|
Kasper Friis Christensen
|
9a17c3220d
|
Show all footer on mobile
|
2017-04-19 21:12:56 +02:00 |
|
|
Kasper Friis Christensen
|
761804eda1
|
Updated media query to match break point
|
2017-04-19 21:12:56 +02:00 |
|
|
Kasper Friis Christensen
|
7b93526f8d
|
Update mobile navigation
|
2017-04-19 21:12:56 +02:00 |
|
|
Kasper Friis Christensen
|
ec7a6c0054
|
Removed double border in btn-groups
|
2017-04-19 21:12:56 +02:00 |
|
|
Thomas Steen Rasmussen
|
b0890fd7d8
|
add channel layers to environment_settings.py.dist, remember to update your local dev environment_settings.py or nothing will work
|
2017-04-19 09:30:01 +02:00 |
|
|
Thomas Steen Rasmussen
|
dad1c6a352
|
remove channel layer from settings.py
|
2017-04-19 09:29:19 +02:00 |
|
|
Thomas Steen Rasmussen
|
305503d60a
|
switch to using supervisord so rename worker runner
|
2017-04-18 22:15:04 +02:00 |
|
|
Stephan Telling
|
0f9ba324cd
|
Merge branch 'master' of github.com:bornhack/bornhack-website
|
2017-04-18 20:49:19 +02:00 |
|
|
Stephan Telling
|
49d4f74472
|
redo email for shop and edd email for team app
|
2017-04-18 20:46:57 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
f96c8b6db5
|
Show speakers in the modal. Also removed favorite action when anonymous.
|
2017-04-17 20:29:59 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
d511df399d
|
Fixing footer.
|
2017-04-16 02:20:59 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
68aa108310
|
Adding favoriting to the schedule.
|
2017-04-16 02:10:45 +02:00 |
|
|
Thomas Steen Rasmussen
|
9f18d94ee1
|
add asgi.py file
|
2017-04-15 20:01:24 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
cad2b468e4
|
Only create the modal if it does not exist.
|
2017-04-15 19:43:30 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
10ff284997
|
Adding channels panel.
|
2017-04-15 19:36:33 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
8000896f3d
|
Adding channels with the schedule as first app using them.
|
2017-04-15 19:35:18 +02:00 |
|
|
Kasper Christensen
|
9d70782b70
|
Added site fonts to .fa-select (#120)
godt spottet tak
|
2017-04-14 23:37:29 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
4f6e6bcd3f
|
Adding modal for events for better userinterface.
|
2017-04-14 23:29:40 +02:00 |
|
|
Thomas Steen Rasmussen
|
5a53be04a1
|
add a fuckton of favicon stuff, working on #109
|
2017-04-14 19:39:44 +02:00 |
|
|
Stephan Telling
|
033ec1b8b5
|
add membership status on team detail and list view
|
2017-04-14 16:16:00 +02:00 |
|
|
Stephan Telling
|
6bc0d57a52
|
add admin actions to add/remove users from teams
|
2017-04-14 16:16:00 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
7b2659df4a
|
Fix camp detail pages.
|
2017-04-14 16:12:26 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
cd93414864
|
Fix menu problem at 768px
|
2017-04-14 15:59:24 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
7df14cc7b2
|
Change the width to be wider!
|
2017-04-14 15:43:32 +02:00 |
|
|
Thomas Steen Rasmussen
|
cc771d20f1
|
only show creditnotes belonging to the logged in user
|
2017-04-14 15:36:41 +02:00 |
|
|
Thomas Steen Rasmussen
|
1e337ec8cd
|
make text on password change button shorter
|
2017-04-14 15:36:09 +02:00 |
|
|
Thomas Steen Rasmussen
|
f33a9393c0
|
hide area from team list
|
2017-04-13 18:50:16 +02:00 |
|
|
Thomas Steen Rasmussen
|
1b6d965a75
|
add volunteer profile, fixes #116
|
2017-04-13 17:44:46 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
463a57172e
|
Move text on events top the top
|
2017-04-13 14:19:50 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
431c15e380
|
Adding right headers for ics view.
|
2017-04-13 14:14:44 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
ac39068e9b
|
Filter events by camp.
|
2017-04-13 14:01:50 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
898f5aa3ef
|
Reducing text
|
2017-04-13 13:53:52 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
222b995766
|
Adding ics button, also some ScheduleView refactor.
|
2017-04-13 13:42:14 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
5e322472e2
|
Refactored ics code and added filtering.
|
2017-04-13 11:48:55 +02:00 |
|
|
Thomas Steen Rasmussen
|
ec53bae454
|
change message when logging in to show email instead of username
|
2017-04-13 11:21:20 +02:00 |
|
|
Thomas Steen Rasmussen
|
ca8661ce4d
|
hide new speaker proposal and new event proposal buttons when call for speakers is not open, fixes #105
|
2017-04-11 14:13:43 +02:00 |
|
|
Thomas Steen Rasmussen
|
43c0ce5882
|
encode before hashing
|
2017-04-11 08:33:52 +02:00 |
|
|
Thomas Steen Rasmussen
|
29eda9999f
|
remove unused code frm another project
|
2017-04-11 08:33:17 +02:00 |
|
|
Thomas Steen Rasmussen
|
2550b99b2b
|
encode to utf8 before hashing
|
2017-04-11 08:19:18 +02:00 |
|
|
Thomas Steen Rasmussen
|
a71cd34f1f
|
make some links on the call for speakers relative and fix some wording
|
2017-04-10 17:06:58 +02:00 |
|
|
Thomas Steen Rasmussen
|
182ec6fef4
|
wording
|
2017-04-09 17:52:41 +02:00 |
|
|
Thomas Steen Rasmussen
|
e2037f929a
|
remove message when there is no speakers
|
2017-04-09 17:51:20 +02:00 |
|
|
Thomas Steen Rasmussen
|
0d7ec82f35
|
show call for speakers button always
|
2017-04-09 17:49:44 +02:00 |
|
|
Thomas Steen Rasmussen
|
e91e181c57
|
add 2017 call for speakers
|
2017-04-09 17:45:02 +02:00 |
|
|
Thomas Steen Rasmussen
|
6288cfd9df
|
remove 2016 from coinify messages
|
2017-04-08 11:58:29 +02:00 |
|
|
Thomas Steen Rasmussen
|
63a10d3af1
|
encode, decode, do something to make this work
|
2017-04-08 11:41:36 +02:00 |
|
|
Thomas Steen Rasmussen
|
7506326cd7
|
decode the utf8 encoded body to a unicode string before passing it on
|
2017-04-08 11:28:08 +02:00 |
|
|
Thomas Steen Rasmussen
|
0d5d6dc31e
|
str() not neccesary here
|
2017-04-08 11:09:54 +02:00 |
|
|
Thomas Steen Rasmussen
|
8a318400ae
|
changed the wrong model :(
|
2017-04-08 11:04:39 +02:00 |
|
|
Thomas Steen Rasmussen
|
e4e5688e3c
|
permit blank payload in callbacks
|
2017-04-08 10:55:40 +02:00 |
|
|
Thomas Steen Rasmussen
|
e5215830b0
|
catch anything here
|
2017-04-08 10:50:51 +02:00 |
|
|
Thomas Steen Rasmussen
|
809e22311d
|
more work on the wording on the team list page
|
2017-04-08 10:14:06 +02:00 |
|
|
Thomas Steen Rasmussen
|
5a4da9bdff
|
more work on team templates
|
2017-04-08 10:09:06 +02:00 |
|
|
Thomas Steen Rasmussen
|
a16c6c4ba3
|
small template change to team list
|
2017-04-08 09:58:16 +02:00 |
|
|
Thomas Steen Rasmussen
|
5431ff1852
|
remove member? column
|
2017-04-08 09:57:00 +02:00 |
|
|
Thomas Steen Rasmussen
|
54625985df
|
show message when team doesnt need members!
|
2017-04-08 09:48:54 +02:00 |
|
|
Thomas Steen Rasmussen
|
1bb2b8d9a9
|
a bit more work on the team admin
|
2017-04-08 09:39:43 +02:00 |
|
|
Thomas Steen Rasmussen
|
ae355516ba
|
fixup the admin for teams
|
2017-04-08 09:27:33 +02:00 |
|
|
Thomas Steen Rasmussen
|
ff74141d17
|
add link to teams page to frontpage
|
2017-04-08 08:40:03 +02:00 |
|
|
Thomas Steen Rasmussen
|
ba7a589a06
|
use wording from flyer
|
2017-04-08 08:24:20 +02:00 |
|
|
Thomas Steen Rasmussen
|
1b98c01f63
|
improved error handling, always save callback body, various fixes
|
2017-04-03 18:00:25 +02:00 |
|
|
Thomas Steen Rasmussen
|
3be7319dc3
|
return User objects for team responsible
|
2017-04-03 09:22:15 +02:00 |
|
|
Thomas Steen Rasmussen
|
8ed58664f2
|
make it possible to overrule responsible on team level
|
2017-04-02 23:33:55 +02:00 |
|
|
Thomas Steen Rasmussen
|
c90837a8f0
|
json.loads wants strings
|
2017-04-02 21:55:14 +02:00 |
|
|
Thomas Steen Rasmussen
|
3f69d8521e
|
show if a ticket is used or not
|
2017-04-02 21:40:44 +02:00 |
|
|
Thomas Steen Rasmussen
|
39b2963b18
|
readd submodule with the correct branch
|
2017-04-02 20:21:12 +02:00 |
|
|
Thomas Steen Rasmussen
|
905091f923
|
remove submodule
|
2017-04-02 20:20:11 +02:00 |
|
|
Thomas Steen Rasmussen
|
56741335aa
|
a few template fixes for team pages
|
2017-04-02 20:05:43 +02:00 |
|
|
Thomas Steen Rasmussen
|
fe1708bb2c
|
show team member count, only show join team button when team needs members
|
2017-04-02 19:54:06 +02:00 |
|
|
Thomas Steen Rasmussen
|
5b88085ac5
|
trailing ,
|
2017-04-02 19:27:50 +02:00 |
|
|
Thomas Steen Rasmussen
|
39afd3f01f
|
show real name if possible
|
2017-04-02 19:23:23 +02:00 |
|
|
Thomas Steen Rasmussen
|
d2a78dcf1c
|
add some more details to team list and detail pages
|
2017-04-02 19:11:11 +02:00 |
|
|
Thomas Steen Rasmussen
|
0dc1ca9704
|
rework team stuff
|
2017-04-02 18:04:57 +02:00 |
|
|
Thomas Steen Rasmussen
|
3f9fd744ee
|
reenable epay payments
|
2017-04-02 17:04:20 +02:00 |
|
|
Thomas Steen Rasmussen
|
3dd3c71a8c
|
fix bootstrap script after leader->responsible rename
|
2017-04-02 10:03:04 +02:00 |
|
|
Thomas Steen Rasmussen
|
37b54d799e
|
fix a few things on the 2017 camp detail page, fixes #101
|
2017-04-01 23:32:42 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
f2b411b60a
|
Adding subteams to teams
|
2017-04-01 23:16:23 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
2864593b00
|
Moving some menus around.
|
2017-04-01 21:45:43 +02:00 |
|
|
Thomas Steen Rasmussen
|
35f22bdb71
|
adapt ics code to work with eventinstances instead of the old event.days system
|
2017-03-31 19:42:10 +02:00 |
|
|
Thomas Steen Rasmussen
|
33689c5270
|
fix a few ics related things, move ics functions to seperate file
|
2017-03-31 19:33:19 +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
|
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
|
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
|
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 |
|
|
Thomas Steen Rasmussen
|
47c0a482f6
|
reserve the slug 'created' to stop creative souls from creating a url conflict
|
2017-03-08 02:02:51 +01:00 |
|
|
Thomas Steen Rasmussen
|
271bfccfff
|
only show approved speakers
|
2017-03-08 02:02:08 +01:00 |
|
|
Thomas Steen Rasmussen
|
e233d15de3
|
use include for this
|
2017-03-08 02:01:38 +01:00 |
|
|
Thomas Steen Rasmussen
|
bd76e7cc7b
|
better headline
|
2017-03-08 00:24:53 +01:00 |
|
|
Stephan Telling
|
656536974b
|
fix error with CampRelatedModel
|
2017-03-08 00:24:14 +01:00 |
|
|
Thomas Steen Rasmussen
|
f7b1f040bb
|
fix merge conflict
|
2017-03-08 00:07:12 +01:00 |
|
|
Thomas Steen Rasmussen
|
334f0477fe
|
start work on speaker and talk submissions
|
2017-03-08 00:00:17 +01:00 |
|
|
Stephan Telling
|
d7435ffa96
|
update camp with read only field, fix #96
|
2017-03-07 21:44:30 +01:00 |
|
|
Thomas Steen Rasmussen
|
5f9f9bb1d4
|
Merge branch 'master' of github.com:bornhack/bornhack-website
|
2017-03-07 21:30:11 +01:00 |
|
|
Stephan Telling
|
1c1bc2188f
|
update bootstrap script to verify emails of users, fix #97.
|
2017-03-07 20:21:07 +01:00 |
|
|
Thomas Steen Rasmussen
|
eb6c0995bf
|
add missing migration for video stuff
|
2017-03-06 19:39:27 +01:00 |
|
|
Thomas Steen Rasmussen
|
ca42685e2b
|
remove circus from requirements
|
2017-03-05 17:30:25 +01:00 |
|
|
Thomas Steen Rasmussen
|
9e4d3a28c3
|
add circus to requirements
|
2017-03-05 10:28:57 +01:00 |
|
|
Stephan Telling
|
d06f2355de
|
add video fields on event model, fix #82
|
2017-02-23 21:51:36 +01:00 |
|
|
Stephan Telling
|
999c7e971b
|
show coming soon text for speakers, schedule and events. fix #93.
|
2017-02-22 10:02:02 +01:00 |
|
|
Stephan Telling
|
ab01797e51
|
rename duplicate EventInstanceAdmin to EventLocationAdmin
|
2017-02-21 16:05:57 +01:00 |
|
|
Stephan Telling
|
9461f4da22
|
encode string as utf-8 before hashing
|
2017-02-20 20:07:58 +01:00 |
|
|
Thomas Steen Rasmussen
|
0ebd683e02
|
permit blank comments to make the admin less annoying
|
2017-02-20 19:34:12 +01:00 |
|
|
Thomas Steen Rasmussen
|
eb13b2d6e2
|
use category name instead of uuid in settings
|
2017-02-20 17:32:57 +01:00 |
|
|
Thomas Steen Rasmussen
|
77f79ec64c
|
make the small logo link to the camp detail page when viewing a camp specific page
|
2017-02-20 00:08:32 +01:00 |
|
|
Thomas Steen Rasmussen
|
f1e4fc9fea
|
fix url tag
|
2017-02-19 23:17:36 +01:00 |
|
|
Thomas Steen Rasmussen
|
81e2be93c7
|
handle the times when we have no resolver_match
|
2017-02-19 23:12:15 +01:00 |
|
|
Thomas Steen Rasmussen
|
9de824d877
|
there is no camp
|
2017-02-19 22:59:09 +01:00 |
|
|
Thomas Steen Rasmussen
|
69e222247b
|
handle unknown camp url slugs with debugmode off
|
2017-02-19 22:56:11 +01:00 |
|
|
Thomas Steen Rasmussen
|
5452da1ddb
|
fixup the camp menu a bit
|
2017-02-19 21:31:16 +01:00 |
|
|
Thomas Steen Rasmussen
|
6684b0cecd
|
add some more stuff to the 2017 frontpage
|
2017-02-19 21:27:09 +01:00 |
|
|
Thomas Steen Rasmussen
|
3297ce17b2
|
remove unused frontpage template
|
2017-02-19 21:21:15 +01:00 |
|
|
Thomas Steen Rasmussen
|
98bb51941e
|
add camp redirect views
|
2017-02-19 21:20:19 +01:00 |
|
|
Thomas Steen Rasmussen
|
0acf3e0fee
|
something is wrong with the logo
|
2017-02-19 19:54:06 +01:00 |
|
|
Thomas Steen Rasmussen
|
4480b4efba
|
add real logos for 2017
|
2017-02-19 19:51:16 +01:00 |
|
|
Thomas Steen Rasmussen
|
7e09945676
|
show speaker pictures when available
|
2017-02-19 19:44:46 +01:00 |
|
|
Thomas Steen Rasmussen
|
63465ad784
|
add missing import
|
2017-02-19 19:16:33 +01:00 |
|
|
Thomas Steen Rasmussen
|
9334f51c9a
|
fix speaker pictures
|
2017-02-19 18:17:56 +01:00 |
|
|
Thomas Steen Rasmussen
|
9092af2b49
|
add /public/ to the start of upload_to
|
2017-02-19 14:05:26 +01:00 |
|
|
Thomas Steen Rasmussen
|
3e7b85c53f
|
missing import, and add /public/ to the start of the url
|
2017-02-19 14:04:31 +01:00 |
|
|
Thomas Steen Rasmussen
|
56d8a9765d
|
add view to show speaker pictures without exposing all of MEDIA_ROOT
|
2017-02-19 13:15:55 +01:00 |
|
|
Thomas Steen Rasmussen
|
cb5c2386eb
|
set upload path for speaker pictures
|
2017-02-18 12:44:12 +01:00 |
|
|
Thomas Steen Rasmussen
|
c6b27de400
|
working on speaker pictures for issue #84
|
2017-02-18 12:30:26 +01:00 |
|
|
Thomas Steen Rasmussen
|
e8dea3eccc
|
add migration for ordering change in an earlier commit
|
2017-02-18 11:50:55 +01:00 |
|
|
Thomas Steen Rasmussen
|
fa9584dcc7
|
show speakers on event detail page where relevant, fixes #91
|
2017-02-18 11:18:07 +01:00 |
|
|
Thomas Steen Rasmussen
|
d73222ec9a
|
remove newline
|
2017-02-17 19:10:57 +01:00 |
|
|
Thomas Steen Rasmussen
|
5d8891c2df
|
remove newline
|
2017-02-17 19:01:17 +01:00 |
|
|
Víðir Valberg Guðmundsson
|
59bb0f8e3a
|
Rewrite bits of the program scheduling to work better on mobile.
|
2017-02-17 17:17:32 +01:00 |
|
|
Thomas Steen Rasmussen
|
924141d922
|
show info headline
|
2017-02-16 22:52:40 +01:00 |
|
|
Thomas Steen Rasmussen
|
13cec1e911
|
render commonmark
|
2017-02-16 22:12:44 +01:00 |
|
|
Thomas Steen Rasmussen
|
464976c482
|
flip the sorting
|
2017-02-16 22:05:10 +01:00 |
|
|
Stephan Telling
|
73f7d5b1b2
|
Merge branch 'master' of github.com:bornhack/bornhack-website
|
2017-02-16 21:03:40 +01:00 |
|
|
Stephan Telling
|
9e5b147d6e
|
register eventlocation in program admin
|
2017-02-16 21:03:24 +01:00 |
|
|
Víðir Valberg Guðmundsson
|
12a5262cc4
|
Nitpicking - I\'m back
|
2017-02-16 18:05:58 +01:00 |
|
|
Thomas Steen Rasmussen
|
b2a5874a1c
|
make program filter buttons smaller
|
2017-02-11 18:24:26 +01:00 |
|
|
Thomas Steen Rasmussen
|
2c648b12c8
|
remove some unused markup, and fix color of text
|
2017-02-11 17:56:04 +01:00 |
|
|
Thomas Steen Rasmussen
|
10a1b55618
|
fix typo
|
2017-02-11 17:48:47 +01:00 |
|
|
Thomas Steen Rasmussen
|
8af7adc943
|
add DEBUG
|
2017-02-11 17:22:02 +01:00 |
|
|
Thomas Steen Rasmussen
|
9fc7d77834
|
add some missing quoting
|
2017-02-11 17:11:40 +01:00 |
|
|
Thomas Steen Rasmussen
|
ca7a7560bb
|
Merge branch 'master' of github.com:bornhack/bornhack-website
|
2017-02-11 16:51:29 +01:00 |
|
|
Thomas Steen Rasmussen
|
a915662689
|
adapt environment_settings.py.dist to jinja format
|
2017-02-11 16:50:29 +01:00 |
|
|
Stephan Telling
|
3c59e7ed1d
|
update bootstrap script with food events for new locations feature
|
2017-02-11 14:34:30 +01:00 |
|
|
Thomas Steen Rasmussen
|
752a3f7e38
|
add EventLocation model, restructure schedule filtering navigation
|
2017-02-08 23:34:24 +01:00 |
|
|
Thomas Steen Rasmussen
|
fa8426441b
|
remove debug output
|
2017-02-02 14:40:26 +01:00 |
|
|
Thomas Steen Rasmussen
|
5bc728a2e8
|
ircbot and notification worker basic functionality works
|
2017-02-02 14:37:17 +01:00 |
|
|
Thomas Steen Rasmussen
|
3715d00701
|
Revert "remove __init__.py files"
This reverts commit c3a4994d35.
|
2017-02-02 00:18:23 +01:00 |
|
|
Thomas Steen Rasmussen
|
c3a4994d35
|
remove __init__.py files
|
2017-02-01 21:41:00 +01:00 |
|
|
Thomas Steen Rasmussen
|
2ecda214ce
|
small fixes to ircbot
|
2017-02-01 01:09:21 +01:00 |
|
|
Thomas Steen Rasmussen
|
330ab25bd3
|
wrap this baby in int()
|
2017-01-31 23:45:53 +01:00 |
|
|
Thomas Steen Rasmussen
|
bae4e78b3f
|
Merge branch 'master' of github.com:bornhack/bornhack-website
|
2017-01-31 23:40:20 +01:00 |
|
|
Thomas Steen Rasmussen
|
4cd344601a
|
replace __unicode__ with __str__ here and there, remove camp title from event boxes on schedule overview
|
2017-01-31 23:39:49 +01:00 |
|
|
Stephan Telling
|
40a89ccf36
|
fix static -> static_src in createcamp command and readme
|
2017-01-31 23:30:31 +01:00 |
|
|
Thomas Steen Rasmussen
|
dcbf9b6992
|
readd middleware with the 1.10 setting
|
2017-01-31 23:26:45 +01:00 |
|
|
Thomas Steen Rasmussen
|
c047506d26
|
better example values for .dist
|
2017-01-31 23:02:27 +01:00 |
|
|
Thomas Steen Rasmussen
|
593b40ea6a
|
remove accidental committed file
|
2017-01-31 22:59:29 +01:00 |
|
|
Thomas Steen Rasmussen
|
2a41b03e56
|
Merge branch 'master' of github.com:bornhack/bornhack-website
|
2017-01-31 22:50:49 +01:00 |
|
|
Thomas Steen Rasmussen
|
ea14ae5e38
|
remove django-environ and more work on irc bot
|
2017-01-31 22:50:28 +01:00 |
|
|
Stephan Telling
|
2fa98cb02e
|
add command to create dirs and html files for a new camp
|
2017-01-31 22:03:03 +01:00 |
|
|
Thomas Steen Rasmussen
|
75122cfc4e
|
py3 migrations
|
2017-01-31 18:52:25 +01:00 |
|
|
Thomas Steen Rasmussen
|
229bd11387
|
update requirements for py3
|
2017-01-30 19:23:36 +01:00 |
|
|
Thomas Steen Rasmussen
|
ff1afd128d
|
rename requirements file
|
2017-01-30 19:15:58 +01:00 |
|
|
Thomas Steen Rasmussen
|
9e5709d200
|
fix the stuff 2to3 got wrong
|
2017-01-30 12:22:43 +01:00 |
|
|
Thomas Steen Rasmussen
|
3a7b952090
|
first pass with 2to3
|
2017-01-30 12:16:07 +01:00 |
|
|
Thomas Steen Rasmussen
|
0ff37bbca5
|
move code to src/ folder
|
2017-01-30 12:06:49 +01:00 |
|