sintonia/python_apps/pypo
Martin Konecny 6f270bfb3d Merge branch '2.0.x' into devel
Conflicts:
	VERSION
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/Show.php
	airtime_mvc/public/js/airtime/dashboard/helperfunctions.js
	install_minimal/include/airtime-constants.php
	python_apps/api_clients/api_client.py
	python_apps/pypo/pypocli.py
	python_apps/pypo/pypofetch.py
2012-03-12 17:52:17 -04:00
..
install CC-3377: Airtime 2.0.2 install fails for ubuntu 11.10 2012-03-02 18:41:03 -05:00
liquidsoap_bin CC-3133: Enabling hardware audio output causes all playout to fail with Portaudio error in write_stream: Output underflowed 2011-12-02 13:39:16 -05:00
liquidsoap_scripts CC-3318: When changing stream settings (Liquidsoap + Pypo restart), sometimes Airtime does not resume playback 2012-02-10 18:43:40 -05:00
test CC-3297: Depend on zendframework and php-pear as external packages 2012-02-06 14:18:03 -05:00
AUTHORS CC-2016: Rearrange python scripts for reusability 2011-03-24 00:00:46 -04:00
LICENSE CC-2016: Rearrange python scripts for reusability 2011-03-24 00:00:46 -04:00
airtime-liquidsoap -fixed on-air light not working. 2011-10-11 13:36:07 +02:00
airtime-playout CC-3366: Pypo: Use local files instead of downloading them 2012-03-01 18:00:46 -05:00
airtime-playout-init-d CC-3206: Add ability to do Airtime upgrade without restarting liquidsoap 2011-12-15 11:22:22 -05:00
logging.cfg CC-3346: Recorder: Merge recorder with pypo 2012-02-28 14:44:39 -05:00
monit-airtime-liquidsoap.cfg CC-2888: Create a monit file for each airtime component 2011-09-26 14:40:26 -04:00
monit-airtime-playout.cfg CC-2888: Create a monit file for each airtime component 2011-09-26 14:40:26 -04:00
pypo-notify.py CC-3336: Refactor schedule API used by pypo 2012-02-29 21:27:42 -05:00
pypo.cfg CC-3346: Recorder: Merge recorder with pypo 2012-02-24 14:11:35 -05:00
pypocli.py CC-3366: Pypo: Use local files instead of downloading them 2012-03-01 18:00:46 -05:00
pypofetch.py Merge branch '2.0.x' into devel 2012-03-12 17:52:17 -04:00
pypofile.py CC-3366: Pypo: Use local files instead of downloading them 2012-03-01 18:00:46 -05:00
pypomessagehandler.py CC-3346: Recorder: Merge recorder with pypo 2012-02-28 14:44:39 -05:00
pypopush.py CC-733 : adding extra error messages 2012-03-09 11:28:43 +01:00
recorder.py CC-3346: Recorder will not record shows if calendar is not touched 2 2012-02-28 14:45:33 -05:00