summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into stableChristian Pointner2017-01-124-6/+20
|\
| * fix now-playing filterChristian Pointner2017-01-061-1/+1
| * fix fixtures for program-showChristian Pointner2017-01-061-0/+2
| * only show musicpools in nowplayingChristian Pointner2017-01-061-1/+1
| * added support for new noplaying db formatChristian Pointner2017-01-062-4/+16
|/
* added support for multi-shows in JSON.Ernesto Rico-Schmidt2016-09-161-1/+12
* Merge pull request #4 from radio-helsinki-graz/stableErnesto Rico-Schmidt2016-09-071-2/+2
|\
| * expand maximum timerange for add/note to 12 weeks in the futureChristian Pointner2016-09-071-2/+2
* | removed unneeded distinct() method.Ernesto Rico-Schmidt2016-08-201-1/+1
* | display only active program slots of a show.Ernesto Rico-Schmidt2016-08-202-2/+2
* | display only active shows of a host.Ernesto Rico-Schmidt2016-08-201-2/+2
* | list only active host and active shows.Ernesto Rico-Schmidt2016-08-201-4/+2
* | added methods to list only active shows of a host and only active program slo...Ernesto Rico-Schmidt2016-08-201-0/+6
* | Merge pull request #3 from radio-helsinki-graz/recognize_activityErnesto Rico-Schmidt2016-08-1712-86/+107
|\ \ | |/ |/|
| * added ActivityFilter for Hosts, Shows and ProgramSlots.Ernesto Rico-Schmidt2016-08-171-4/+45
| * removed update_{hosts,programslots,shows} management commands.Ernesto Rico-Schmidt2016-08-173-59/+0
| * fixed copy&paste errorErnesto Rico-Schmidt2016-08-171-1/+1
| * removed is_active from Host, Show and ProgramSlot.Ernesto Rico-Schmidt2016-08-179-26/+65
|/
* simplified update commandsErnesto Rico-Schmidt2016-08-162-30/+7
* added management commands to chech and remove stale automation_idsErnesto Rico-Schmidt2016-08-032-0/+51
* hotfix: show has no automation_id anymoreChristian Pointner2016-08-031-2/+0
* Merge branch 'master' into stableChristian Pointner2016-08-033-2/+19
|\
| * remove automation_id in showsErnesto Rico-Schmidt2016-08-033-2/+19
* | Merge branch 'master' into stableChristian Pointner2016-08-033-13/+20
|\ \ | |/
| * limit timeslot, better namingErnesto Rico-Schmidt2016-08-032-11/+18
| * updated Django and Pillow versionsErnesto Rico-Schmidt2016-07-201-2/+2
* | 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