Martin Konecny 2a0c9769aa Merge branch '2.4.x' ... Conflicts: airtime_mvc/public/js/airtime/showbuilder/builder.js python_apps/pypo/liquidsoap_scripts/fdkaac.liq python_apps/pypo/schedule/pypofetch.py python_apps/pypo/schedule/telnetliquidsoap.py		2013-06-14 16:45:52 -04:00
..
common	CC-5121: fix some SQL statements not being escaped/prepared	2013-05-09 14:43:59 -04:00
configs	CC-5163 : Waveform - Hard coded api path will cause fail to open file when airtime is put under subfolder	2013-05-22 15:33:49 -04:00
controllers	CC-5211:	2013-06-06 17:02:01 -04:00
forms	CC-5225 : Library: Fail to open Metadata Editor	2013-06-12 13:05:58 -04:00
layouts/scripts	CC-5108 : Waveform Editor UI	2013-05-23 18:33:40 -04:00
logging	CC-5062:	2013-04-19 20:11:33 -04:00
models	CC-5216: Library length does not consider cue points	2013-06-07 14:19:46 -04:00
services	Merge branch '2.4.x'	2013-06-14 16:45:52 -04:00
validate	CC-2166: Packaging Improvements. Moved the Zend app into airtime_mvc. It is now installed to /var/www/airtime. Storage is now set to /srv/airtime/stor. Utils are now installed to /usr/lib/airtime/utils/. Added install/airtime-dircheck.php as a simple test to see if everything is install/uninstalled correctly.	2011-04-14 18:55:04 -04:00
views	Use proper unit conventions for Kilo	2013-06-07 11:17:35 -04:00
Bootstrap.php	remove duplicate cc_config	2013-03-24 23:11:55 -04:00