aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into events/33c3MaZderMind2016-12-204-23/+117
|\
| * implement streams-api v2MaZderMind2016-12-203-3/+114
| * migrate v1 api to the new conferences accessorsMaZderMind2016-12-201-20/+3
* | add isystems to the footer for 33c3MaZderMind2016-12-201-1/+2
* | configure subtitles server, fixes #36MaZderMind2016-12-201-2/+2
* | repair target filenameMaZderMind2016-12-201-1/+1
* | Merge branch 'master' into events/33c3MaZderMind2016-12-201-9/+31
|\|
| * support depoloying a different branchMaZderMind2016-12-201-1/+14
| * shorten available commands check (and require git)MaZderMind2016-12-201-3/+4
| * allow to override deployment-checksMaZderMind2016-12-201-5/+13
* | add additional downloads to 33c3MaZderMind2016-12-201-0/+6
* | remove that pesky offsetMaZderMind2016-12-201-1/+1
* | repair dash lookupMaZderMind2016-12-191-1/+1
* | adapt 33c3 config to recent changesMaZderMind2016-12-181-37/+52
* | Merge branch 'master' into events/33c3MaZderMind2016-12-1883-1233/+1664
|\|
| * Merge branch 'feature/25-default-schedule-names-to-display-name'MaZderMind2016-12-181-1/+1
| |\
| | * change default of schedule-name to display-nameMaZderMind2016-12-181-1/+1
| |/
| * Merge branch 'feature/33-remove-schedule-ajax-from-startpage'MaZderMind2016-12-186-95/+53
| |\
| | * move upcoming & current logic from javascript/ajax into phpMaZderMind2016-12-186-95/+53
| |/
| * remove .sh-files from deploymentMaZderMind2016-12-181-2/+0
| * remove obsolte download.shMaZderMind2016-12-181-21/+0
| * download eventcalender upcoming, tooMaZderMind2016-12-181-7/+40
| * Merge branch 'feature/20-declarative-downloading'MaZderMind2016-12-1813-31/+271
| |\
| | * use the new cache-files for viewingMaZderMind2016-12-182-10/+3
| | * configure 33c3, dg & cr to use the new schemaMaZderMind2016-12-185-9/+8
| | * implement actual downloadingMaZderMind2016-12-171-0/+28
| | * improve log formattingMaZderMind2016-12-171-1/+2
| | * warn on old-style pathsMaZderMind2016-12-171-0/+12
| | * change storage paths according to issue descriptionMaZderMind2016-12-174-10/+10
| | * access relive config through relive-modelMaZderMind2016-12-111-2/+2
| | * add cache-file getters and download preparationsMaZderMind2016-12-114-1/+83
| | * download files of forced-open conferencesMaZderMind2016-12-112-2/+17
| | * list conferences sorted on startpageMaZderMind2016-12-111-1/+1
| | * use DateTime objects for ends/startsAtMaZderMind2016-12-114-13/+39
| | * commandline helper functionsMaZderMind2016-12-111-0/+15
| | * add download-command cli interface & configMaZderMind2016-12-113-1/+70
| | * add linebreak to error messageMaZderMind2016-12-111-1/+1
| |/
| * better handling for legacy config errorsMaZderMind2016-12-113-18/+23
| * conferences does not use ModelBaseMaZderMind2016-12-111-1/+1
| * repair schedule viewMaZderMind2016-12-112-11/+4
| * Merge branch 'cleanups'MaZderMind2016-12-104-58/+40
| |\
| | * use close-view in allclosed viewMaZderMind2016-12-101-30/+7
| | * repair indentationMaZderMind2016-12-101-16/+16
| | * alwas allow access to the conference about-pageMaZderMind2016-12-101-5/+5
| | * aways print a stack-traceMaZderMind2016-12-101-1/+10
| | * remove unised offsetting in jsMaZderMind2016-12-101-6/+2
| |/
| * Merge branch 'feature/27-unwind-global-config'MaZderMind2016-12-1072-1020/+1263
| |\
| | * rewrite data-model so that every configuration option is accessed through the...MaZderMind2016-12-1028-179/+290
| | * mass-edit config-files to return-based methodMaZderMind2016-12-1044-841/+973
| |/
| * always select 1024x embed code as default, fixes #29MaZderMind2016-12-101-2/+2