summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into stableChristian Pointner2016-07-201-0/+11
|\
| * Merge branch 'predecessor-selection'Christian Pointner2016-07-201-0/+11
| |\
| | * exclude self as show predecessorErnesto Rico-Schmidt2016-07-201-3/+8
| | * exclude idErnesto Rico-Schmidt2016-05-271-0/+6
* | | Merge branch 'master' into stableChristian Pointner2016-06-132-2/+7
|\ \ \ | |/ /
| * | added short_description to list header of program slots.Ernesto Rico-Schmidt2016-06-121-0/+1
| * | show only name in the admin program slots.Ernesto Rico-Schmidt2016-06-121-1/+5
| * | don't include the ID in the show detail pageErnesto Rico-Schmidt2016-06-121-1/+1
* | | Merge branch 'master' into stableChristian Pointner2016-05-271-1/+1
|\ \ \ | |/ /
| * | added automation ID to listErnesto Rico-Schmidt2016-05-271-1/+1
|/ /
* | brown paper bag bugErnesto Rico-Schmidt2016-05-273-7/+1
* | Merge branch 'master' into stableChristian Pointner2016-05-2724-67/+94
|\ \
| * | reverted accidentially committed stuffChristian Pointner2016-05-271-2/+2
| * | merged speed optimization branchChristian Pointner2016-05-272-5/+9
| |\ \ | | |/ | |/|
| | * updated TODOErnesto Rico-Schmidt2016-05-271-0/+9
| | * Update to latest Django 1.8 versionErnesto Rico-Schmidt2016-05-271-1/+1
| | * Optimize selection of time slot by fetching the program slotsErnesto Rico-Schmidt2016-05-271-3/+3
| * | show idErnesto Rico-Schmidt2016-05-271-1/+1
| * | merged stable into masterChristian Pointner2016-05-274-11/+29
| |\ \ | |/ / |/| |
* | | nop: added entries to musicprog listChristian Pointner2016-05-211-1/+4
| |/ |/|
* | Link to predecessor show.Ernesto Rico-Schmidt2016-05-012-2/+2
* | include notes of predecessor show if available.Ernesto Rico-Schmidt2016-05-011-1/+12
* | be explicit about what is not allowed to change while updating.Ernesto Rico-Schmidt2016-05-011-8/+14
* | updated requirements.Ernesto Rico-Schmidt2016-05-011-4/+4
* | minor cosmetics.Ernesto Rico-Schmidt2016-05-011-3/+11
* | Hotfix: add end time to json day schedule, also include date in start/endChristian Pointner2016-04-201-1/+1
* | Merge branch 'master' into stableChristian Pointner2016-04-151-3/+3
|\ \
* \ \ merged master into stable after new deploymentChristian Pointner2016-04-1550-849/+1484
|\ \ \
* | | | enable song listing for Songbirdsrel-2014-07Christian Pointner2015-10-071-1/+2
* | | | updated Django, Pillow and PyYAMLErnesto Rico-Schmidt2014-09-051-3/+3
* | | | fixed the list of showsErnesto Rico-Schmidt2014-08-161-15/+20
* | | | simplified and fixed week scheduleErnesto Rico-Schmidt2014-08-151-46/+43
* | | | handle errors betterErnesto Rico-Schmidt2014-07-211-1/+16
| | | * Merge branch 'master' of github.com:radio-helsinki-graz/pvErnesto Rico-Schmidt2016-05-271-1/+4
| | | |\
| | | | * nop: added entries to musicprog listChristian Pointner2016-05-211-1/+4
| | | * | Update to latest Django 1.8 versionErnesto Rico-Schmidt2016-05-271-1/+1
| | | |/
| | | * merged hotfix (add end time to json day schedule, also include date in start/...Christian Pointner2016-04-201-1/+2
| | | * fixed pep8/flake8 warnings. again.Ernesto Rico-Schmidt2016-04-1917-38/+56
| | | * removed unused templatesErnesto Rico-Schmidt2016-04-163-29/+0
| | | * removed cba_entry_id and cba_series_id from Show and Time Slot modelsErnesto Rico-Schmidt2016-04-163-2/+36
| | | * simplified inline admin for program slots and time slotsErnesto Rico-Schmidt2016-04-161-2/+3
| | | * updated requiremets and TODO listErnesto Rico-Schmidt2016-04-163-4/+9
| | |/
| | * also include pv-id in day-schedule exportChristian Pointner2016-04-151-3/+3
| |/
| * easier to understand export format for day_scheduleChristian Pointner2016-04-141-4/+5
| * fix deprecated option name: mimetype vs. content_typeChristian Pointner2016-04-141-2/+2
| * fixed get_querysetErnesto Rico-Schmidt2016-03-311-2/+2
| * fix initial migrationChristian Pointner2016-03-311-7/+7
| * migrations for database nop should only be done on nop databaseChristian Pointner2016-03-313-0/+9
| * fixed missed renaming of variablesErnesto Rico-Schmidt2016-03-304-4/+4
| * fixed typoErnesto Rico-Schmidt2016-03-301-2/+2