Commit graph

13 commits

Author SHA1 Message Date
denise
586bdf99e9 Merge branch '2.4.x'
Conflicts:
	python_apps/pypo/pypopush.py
	python_apps/pypo/schedule/pypofetch.py
	python_apps/pypo/schedule/pypofile.py
	python_apps/pypo/schedule/pypoliqqueue.py
2013-05-30 15:21:32 -04:00
Martin Konecny
b0eda6e915 Merge branch '2.4.x'
Conflicts:
	airtime_mvc/public/js/airtime/preferences/streamsetting.js
	python_apps/pypo/pypocli.py
	python_apps/pypo/schedule/telnetliquidsoap.py
2013-05-22 12:07:08 -04:00
Martin Konecny
d86edd43ab fix reference to non-existent var 2013-05-21 12:58:19 -04:00
Martin Konecny
46364bec44 fix reference to non-existent var 2013-05-17 14:54:23 -04:00
Martin Konecny
e4b6eef22d remove unecessary backslashes 2013-05-17 14:52:49 -04:00
Martin Konecny
bda22baf0c fix playout not working
-silly mistake due to inf recursion
2013-05-17 14:00:09 -04:00
Martin Konecny
85b73706dc stricter error checking when adding to queues 2013-05-17 12:18:29 -04:00
Martin Konecny
19506fb8c2 remove hard-coded string 2013-05-17 11:55:51 -04:00
Martin Konecny
9165ddc0ec more DRY code. also use "with" instead of try/except 2013-05-17 11:55:14 -04:00
Martin Konecny
e51e046dd0 more lintian fixes
-mostly lines with length > 79
2013-05-16 17:37:01 -04:00
Martin Konecny
060980d8c6 Ensure only telnetliquidsoap has telnet responsibilities
-also added module docstrings
2013-05-16 16:19:00 -04:00
Martin Konecny
888e6db812 more structural organization of files/packages 2013-05-16 13:41:56 -04:00
Martin Konecny
1c87d51b8e Major reorganization of the pypo directory.
Much better organization of files into packages
2013-05-16 13:22:15 -04:00