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
..
airtime	Merge branch '2.1.x' into devel	2012-07-16 14:31:03 -04:00
blockui	CC-3516: Creating a show has a long execution time	2012-03-25 22:56:51 -04:00
colorpicker/js	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
contextmenu	CC-3857: Chmod fixes for files which should not be executable	2012-05-22 11:22:43 -04:00
datatables	CC-3857: Chmod fixes for files which should not be executable	2012-05-22 11:22:43 -04:00
fullcalendar	CC-3940: Calendar displays highlighting with regards to date and time of server instead of adjusting to the Timezone settings	2012-06-11 16:43:24 -04:00
jplayer	CC-3845 : General UI cleanup	2012-05-18 15:40:22 +02:00
libs	CC-3518 : Airtime requires internet access to run	2012-03-30 17:37:21 +02:00
plupload	CC-2768: Plupload update	2011-09-19 11:15:53 -04:00
qtip	CC-3174 : show builder	2012-02-02 23:15:39 +01:00
serverbrowse	CC-1799 Put Airtime Storage into a Human Readable File Naming Convention	2011-06-21 10:24:02 +02:00
sprintf	CC-2363: Diagnostic screen in Web UI	2011-09-22 10:45:43 -04:00
timepicker	CC-3174 : Show builder, working on date choice pickers, make sure they accomodate client/server timezones.	2012-01-23 19:07:07 +01:00