Commit graph

422 commits

Author SHA1 Message Date
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