Commit graph

268 commits

Author SHA1 Message Date
Vidir Valberg Gudmundsson bd1d139d2d Fixing ICSView. 2017-08-16 18:30:02 +02:00
Vidir Valberg Gudmundsson 27a4ff0bbb Comitting latest compiled version 2017-08-16 18:30:02 +02:00
Vidir Valberg Gudmundsson d44ef3bbd8 Adding small indicators of the number of events instances for the different filters. Resulted in some cleanup as well. 2017-08-16 18:30:02 +02:00
Vidir Valberg Gudmundsson 5ce2a59036 Adding lates compiled version. 2017-08-16 18:30:02 +02:00
Vidir Valberg Gudmundsson d4d7fad439 Cleanups. Adding Speaker detail. 2017-08-16 18:30:02 +02:00
Vidir Valberg Gudmundsson a447ca476f Working on event detail. Also small visual help in DayView. Also some favorite stuff. 2017-08-16 18:27:28 +02:00
Vidir Valberg Gudmundsson c237d4ecc7 Adding a back buton on event detail if noscript. 2017-08-16 18:27:28 +02:00
Vidir Valberg Gudmundsson 084d2cee6b Addin the missing template for noscript fallback. 2017-08-16 18:27:28 +02:00
Vidir Valberg Gudmundsson 3411aee34a Make a noscript fallback version of the schedule. 2017-08-16 18:27:28 +02:00
Vidir Valberg Gudmundsson d77564064f Adding compiled version with debug enabled. 2017-08-16 18:27:28 +02:00
Vidir Valberg Gudmundsson 7abd35ab66 Fixing websocket url. 2017-08-16 18:27:28 +02:00
Vidir Valberg Gudmundsson e103cb57b5 Pushing compiled and minified version with debug enabled for staging purposes. 2017-08-16 18:27:28 +02:00
Vidir Valberg Gudmundsson a938f2406f Filtering by video recording is now possible. Also show video recording states. 2017-08-16 18:27:28 +02:00
Vidir Valberg Gudmundsson 4279653fcb Differentiating between data is too cumbersome, so now we just load everything on start. Think about optimizing later! 2017-08-16 18:27:28 +02:00
Vidir Valberg Gudmundsson 23d94145b7 Detail pages are for events. We now also load event data when accessing a detailpage directly. 2017-08-16 18:27:28 +02:00
Vidir Valberg Gudmundsson e8c0ab1941 Organized the code in a more sane manner. Also some websocket work. 2017-08-16 18:27:28 +02:00
Vidir Valberg Gudmundsson 9b36959057 Remove that javascript garbage. 2017-08-16 18:27:28 +02:00
Vidir Valberg Gudmundsson ebf4526425 Woops, no need to commit compiled version yet. 2017-08-16 18:26:49 +02:00
Vidir Valberg Gudmundsson db14e7d80e Replace schedule_overview.html with schedule_overview_elm.html. 2017-08-16 18:26:49 +02:00
Vidir Valberg Gudmundsson b49a0ad556 Accomplished feature parity in filtering. 2017-08-16 18:26:49 +02:00
Vidir Valberg Gudmundsson a6470d2ec9 Initial work on the schedule written in elm. 2017-08-16 18:26:49 +02:00
Stephan Telling 973bdc575c
fix 144 2017-08-14 18:58:19 +02:00
klarstrup 5ff0289d6f Add href attribute to event link 2017-08-06 21:09:43 +02:00
Thomas Steen Rasmussen c5d7caf3fc better description for formfield 2017-08-01 15:28:04 +02:00
Thomas Steen Rasmussen 036fcf67ef add missing migrations from whatever 2017-08-01 15:26:36 +02:00
Thomas Steen Rasmussen 222da21e7f add some text describing how to propose stuff 2017-08-01 15:23:11 +02:00
Thomas Steen Rasmussen aa5eb1f904 fix bug that made all speakers and eventtypes visible when modifying an event proposal 2017-07-31 22:05:44 +02:00
Thomas Steen Rasmussen 9b44d9d451 fix a typo 2017-07-31 18:28:13 +02:00
Stephan Telling 56fc0b4db6
allow users to change the state of allow_video_recording when updating 2017-07-19 15:18:45 +02:00
Stephan Telling d4ba512920 fix clean method for eventinstance
You can no longer save eventinstances where the camp year doesnt match
for its location and event.
2017-07-15 18:16:52 +02:00
Vidir Valberg Gudmundsson 5b1d1c79e9 Fix error where everything looks like it has a video. 2017-07-15 18:16:27 +02:00
Vidir Valberg Gudmundsson c5ae8f4d6e Revamp schedule code and fix #128. 2017-07-15 17:58:53 +02:00
Stephan Telling 1a3e1088f7
delete event if speakers arent approved or created 2017-07-15 17:17:19 +02:00
Stephan Telling 05946d065b
fix issue with approving eventproposal with unapproved speakers
This commit fixes some issues around approving eventproposals with no
speakers attached or unapproved speakers attached.
2017-07-15 16:48:30 +02:00
Stephan Telling b60d8fb9a8 fix #135 2017-07-15 15:57:31 +02:00
Stephan Telling 9866149636
fix event proposal emails, name -> title 2017-07-14 11:03:35 +02:00
Stephan Telling 8b000d8dae
fix string formatting of uuid for irc message 2017-07-13 21:18:57 +02:00
Víðir Valberg Guðmundsson 471e260380 Fixing width on speaker image. 2017-07-12 15:49:52 +02:00
Víðir Valberg Guðmundsson 026324802b Make locations distinguishable 2017-07-12 11:36:23 +02:00
Víðir Valberg Guðmundsson 734c810cff Making EventLocations a bit more usable. 2017-07-12 11:07:11 +02:00
Stephan Telling 3ef4094e94 Merge branch 'master' of github.com:bornhack/bornhack-website 2017-07-11 23:15:31 +02:00
Stephan Telling 78c4f14048
fix irc message for proposals 2017-07-11 23:14:30 +02:00
Stephan Telling 534a2d790d
add missing migration 2017-07-11 23:14:05 +02:00
Thomas Steen Rasmussen 8fd7f4c813 unfuck migrations maybe 2017-07-11 22:57:26 +02:00
Thomas Steen Rasmussen 533c1b3efa add initial people stuff 2017-07-11 22:50:31 +02:00
Stephan Telling f4a2f6cea6
add irc messages when new event- or speakerproposals are created 2017-07-11 22:29:06 +02:00
Stephan Telling c02598bfde
fix link in event proposal email 2017-07-11 22:20:53 +02:00
Stephan Telling fcd85f680a
fix #133
An email is now sent when a new speaker- or eventproposal is created and
when any such is updated.
2017-07-11 22:02:19 +02:00
Thomas Steen Rasmussen bded5d8192 field is called allow_video_recording in EventProposal 2017-07-11 05:24:08 +02:00
Víðir Valberg Guðmundsson 65a085b3ab Output event instance datatimes as timezone. 2017-07-10 12:57:35 +02:00
Víðir Valberg Guðmundsson c313397def Fix video alert in event modal. 2017-07-10 12:50:15 +02:00
Stephan Telling b9fcd841f7 Merge branch 'master' of github.com:bornhack/bornhack-website 2017-07-09 21:26:20 +02:00
Stephan Telling 6744ee1959
add field to allow video recording on event proposal 2017-07-09 21:24:25 +02:00
Víðir Valberg Guðmundsson c32d4aee82 Filter proposals. 2017-07-09 17:00:44 +02:00
Thomas Steen Rasmussen 38d8c25775 fix argument name 2017-07-09 16:54:21 +02:00
Thomas Steen Rasmussen 4f0de99ea2 fix bug in speaker<>camp relationship validation in signal handler 2017-07-09 16:48:02 +02:00
Víðir Valberg Guðmundsson 034543595a Fix error in consumer when camp matching query does not exist. 2017-07-09 16:37:19 +02:00
Víðir Valberg Guðmundsson b27bac8500 Fix error hvor speaker will be added every time a modal is opened. 2017-07-09 16:12:10 +02:00
Víðir Valberg Guðmundsson a32f04548c Adding icon which shows is an event will be recorded or not. 2017-07-09 16:07:59 +02:00
Víðir Valberg Guðmundsson 624ae872a3 Add filtering for events 2017-07-09 15:48:29 +02:00
Víðir Valberg Guðmundsson aa29480498 Apply filtering to ICS button. 2017-07-08 23:00:54 +02:00
Stephan Telling 32651eafa7
add initial files for 2019 2017-07-08 20:16:58 +02:00
Stephan Telling 3141e8f588
add missing import, remove unused import and minor changes 2017-06-05 14:52:59 +02:00
Stephan Telling 1bfe068d77
add 2018 templates 2017-06-04 13:42:23 +02:00
Thomas Steen Rasmussen 903b214d86 do not make all checkboxes in the world invisible 2017-05-23 23:11:32 +02:00
Thomas Steen Rasmussen 12dbc05680 add missing migration for program 2017-04-30 14:12:23 +02:00
Víðir Valberg Guðmundsson 5ef3e79b38 Making day menu responsive. 2017-04-29 14:58:21 +02:00
Víðir Valberg Guðmundsson 521d3c9c71 Fix type filter. 2017-04-29 13:21:06 +02:00
Víðir Valberg Guðmundsson c32cde780a Adding icons 2017-04-29 12:23:10 +02:00
Víðir Valberg Guðmundsson c845dca950 Now with support for days! 2017-04-27 00:23:03 +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 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
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 68aa108310 Adding favoriting to the schedule. 2017-04-16 02:10:45 +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 8000896f3d Adding channels with the schedule as first app using them. 2017-04-15 19:35:18 +02:00
Víðir Valberg Guðmundsson 4f6e6bcd3f Adding modal for events for better userinterface. 2017-04-14 23:29:40 +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 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 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 0dc1ca9704 rework team stuff 2017-04-02 18:04:57 +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 9e3ed81731 fix pictures 2017-03-30 00:20:14 +02:00
Thomas Steen Rasmussen cbd6457947 fixup the event list a bit, fixes #90 2017-03-26 15:05:29 +02:00
Thomas Steen Rasmussen 171553677c fixup logging 2017-03-23 18:32:13 +01:00
Stephan Telling 2c28e22f34
move fa-select css to bornhack.css 2017-03-19 18:13:38 +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 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 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
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 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 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 eb6c0995bf add missing migration for video stuff 2017-03-06 19:39:27 +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
Thomas Steen Rasmussen f1e4fc9fea fix url tag 2017-02-19 23:17:36 +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