Martin Konecny 4ebcb1b1f9 Merge branch '2.1.x' into devel ...

Conflicts:
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/controllers/PlaylistController.php
	airtime_mvc/application/models/Playlist.php
	python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py
	python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py

2012-07-16 14:31:03 -04:00

..

install

clean up indentation + imports for python apps

2012-06-26 22:41:11 -04:00

liquidsoap_bin @ 0653ec0b89

CC-4090: Make code style PSR compliant

2012-07-10 18:51:32 -04:00

liquidsoap_scripts

-Remove useless api_client interface

2012-07-12 16:51:11 -04:00

test

CC-1927 Remove PEAR DB

2012-04-19 16:35:19 -04:00

__init__.py

-add support for PyDev code analysis (need to make pypo directory a package)

2012-03-17 13:56:41 -04:00

airtime-liquidsoap

-make sure to autogenerate liquidsoap.cfg before liquidsoap starts

2012-05-28 18:48:40 -04:00

airtime-playout

CC-3889: Add line "export TERM=xterm" to pypo bash script startup file

2012-06-05 13:07:59 -04:00

airtime-playout-init-d

Random commits gathered and put into one

2012-07-09 18:58:22 -04: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

logging.cfg

CC-4032: pyponotify.py fails because not all files in /var/log/airtime/pypo are read/writable by pypo

2012-06-28 17:09:41 -04: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

notify_logging.cfg

CC-4032: pyponotify.py fails because not all files in

2012-06-28 17:17:36 -04:00

pypo.cfg

CC-3664: setting of pypo.cfg -> cache_for does not take effect

2012-04-17 10:23:15 -04:00

pypocli.py

-Remove useless api_client interface

2012-07-12 16:51:11 -04:00

pypofetch.py

-Remove useless api_client interface

2012-07-12 16:51:11 -04:00

pypofile.py

CC-4058: Timeline -> Cannot add song twice if last cursor is selected

2012-07-03 17:06:35 -04:00

pypomessagehandler.py

clean up indentation + imports for python apps

2012-06-26 22:41:11 -04:00

pyponotify.py

-Remove useless api_client interface

2012-07-12 16:51:11 -04:00

pypopush.py

-Remove useless api_client interface

2012-07-12 16:51:11 -04:00

recorder.py

-Remove useless api_client interface

2012-07-12 16:51:11 -04:00