Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into stable | Christian Pointner | 2017-04-06 | 1 | -15/+24 |
|\ | |||||
| * | fix check_automation_ids command | Christian Pointner | 2017-04-06 | 1 | -15/+24 |
| | | |||||
| * | Merge branch 'stable' | Christian Pointner | 2017-03-09 | 4 | -13/+13 |
| |\ | |/ |/| | |||||
* | | Hotfix: datetime.now as callable for query sets to fix implicit 'caching' ↵ | Christian Pointner | 2017-03-09 | 4 | -13/+13 |
| | | | | | | | | problem after switching to uwsgi | ||||
* | | Merge branch 'master' into stable | Christian Pointner | 2017-02-20 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | restore old url behavior, which is now supported by the plone proxyview | Johannes Raggam | 2017-02-19 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into stable | Christian Pointner | 2017-02-17 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | fix url to specific day view | Johannes Raggam | 2017-02-17 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into stable | Christian Pointner | 2017-02-17 | 1 | -1/+2 |
|\ \ | |/ | |||||
| * | added pussy*whipped to list of music-shows | Christian Pointner | 2017-02-17 | 1 | -1/+2 |
| | | |||||
* | | Merge branch 'master' into stable | Christian Pointner | 2017-01-12 | 4 | -6/+20 |
|\ \ | |/ | |||||
| * | fix now-playing filter | Christian Pointner | 2017-01-06 | 1 | -1/+1 |
| | | |||||
| * | fix fixtures for program-show | Christian Pointner | 2017-01-06 | 1 | -0/+2 |
| | | |||||
| * | only show musicpools in nowplaying | Christian Pointner | 2017-01-06 | 1 | -1/+1 |
| | | |||||
| * | added support for new noplaying db format | Christian Pointner | 2017-01-06 | 2 | -4/+16 |
|/ | |||||
* | added support for multi-shows in JSON. | Ernesto Rico-Schmidt | 2016-09-16 | 1 | -1/+12 |
| | |||||
* | Merge pull request #4 from radio-helsinki-graz/stable | Ernesto Rico-Schmidt | 2016-09-07 | 1 | -2/+2 |
|\ | | | | | expand maximum time range for add/note to 12 weeks in the future | ||||
| * | expand maximum timerange for add/note to 12 weeks in the future | Christian Pointner | 2016-09-07 | 1 | -2/+2 |
| | | |||||
* | | removed unneeded distinct() method. | Ernesto Rico-Schmidt | 2016-08-20 | 1 | -1/+1 |
| | | |||||
* | | display only active program slots of a show. | Ernesto Rico-Schmidt | 2016-08-20 | 2 | -2/+2 |
| | | |||||
* | | display only active shows of a host. | Ernesto Rico-Schmidt | 2016-08-20 | 1 | -2/+2 |
| | | |||||
* | | list only active host and active shows. | Ernesto Rico-Schmidt | 2016-08-20 | 1 | -4/+2 |
| | | |||||
* | | added methods to list only active shows of a host and only active program ↵ | Ernesto Rico-Schmidt | 2016-08-20 | 1 | -0/+6 |
| | | | | | | | | slots of a show. | ||||
* | | Merge pull request #3 from radio-helsinki-graz/recognize_activity | Ernesto Rico-Schmidt | 2016-08-17 | 12 | -86/+107 |
|\ \ | |/ |/| | Recognize activity | ||||
| * | added ActivityFilter for Hosts, Shows and ProgramSlots. | Ernesto Rico-Schmidt | 2016-08-17 | 1 | -4/+45 |
| | | |||||
| * | removed update_{hosts,programslots,shows} management commands. | Ernesto Rico-Schmidt | 2016-08-17 | 3 | -59/+0 |
| | | |||||
| * | fixed copy&paste error | Ernesto Rico-Schmidt | 2016-08-17 | 1 | -1/+1 |
| | | |||||
| * | removed is_active from Host, Show and ProgramSlot. | Ernesto Rico-Schmidt | 2016-08-17 | 9 | -26/+65 |
|/ | |||||
* | simplified update commands | Ernesto Rico-Schmidt | 2016-08-16 | 2 | -30/+7 |
| | |||||
* | added management commands to chech and remove stale automation_ids | Ernesto Rico-Schmidt | 2016-08-03 | 2 | -0/+51 |
| | |||||
* | hotfix: show has no automation_id anymore | Christian Pointner | 2016-08-03 | 1 | -2/+0 |
| | |||||
* | Merge branch 'master' into stable | Christian Pointner | 2016-08-03 | 3 | -2/+19 |
|\ | |||||
| * | remove automation_id in shows | Ernesto Rico-Schmidt | 2016-08-03 | 3 | -2/+19 |
| | | |||||
* | | Merge branch 'master' into stable | Christian Pointner | 2016-08-03 | 3 | -13/+20 |
|\ \ | |/ | |||||
| * | limit timeslot, better naming | Ernesto Rico-Schmidt | 2016-08-03 | 2 | -11/+18 |
| | | |||||
| * | updated Django and Pillow versions | Ernesto Rico-Schmidt | 2016-07-20 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into stable | Christian Pointner | 2016-07-20 | 1 | -0/+11 |
|\ \ | |/ | |||||
| * | Merge branch 'predecessor-selection' | Christian Pointner | 2016-07-20 | 1 | -0/+11 |
| |\ | |||||
| | * | exclude self as show predecessor | Ernesto Rico-Schmidt | 2016-07-20 | 1 | -3/+8 |
| | | | |||||
| | * | exclude id | Ernesto Rico-Schmidt | 2016-05-27 | 1 | -0/+6 |
| | | | |||||
* | | | Merge branch 'master' into stable | Christian Pointner | 2016-06-13 | 2 | -2/+7 |
|\ \ \ | |/ / | | | | | | | don't display show-id | title everywhere... | ||||
| * | | added short_description to list header of program slots. | Ernesto Rico-Schmidt | 2016-06-12 | 1 | -0/+1 |
| | | | |||||
| * | | show only name in the admin program slots. | Ernesto Rico-Schmidt | 2016-06-12 | 1 | -1/+5 |
| | | | |||||
| * | | don't include the ID in the show detail page | Ernesto Rico-Schmidt | 2016-06-12 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' into stable | Christian Pointner | 2016-05-27 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | added automation ID to list | Ernesto Rico-Schmidt | 2016-05-27 | 1 | -1/+1 |
|/ / | |||||
* | | brown paper bag bug | Ernesto Rico-Schmidt | 2016-05-27 | 3 | -7/+1 |
| | | |||||
* | | Merge branch 'master' into stable | Christian Pointner | 2016-05-27 | 24 | -67/+94 |
|\ \ | |||||
| * | | reverted accidentially committed stuff | Christian Pointner | 2016-05-27 | 1 | -2/+2 |
| | | | |||||
| * | | merged speed optimization branch | Christian Pointner | 2016-05-27 | 2 | -5/+9 |
| |\ \ | | |/ | |/| |