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
..
ACL.php	CC-4042: Media Library -> Non-admin user cannot see "File import in progress"	2012-06-29 12:49:59 -04:00
airtime-conf-production.php	CC-3694: Upgrade fails with Propel database conversion.	2012-04-20 15:37:51 -04:00
airtime-conf.php	CC-2591: Allow upload of any audio clip to Soundcloud	2011-09-22 11:47:24 -04:00
application.ini	CC-3320: Upgrade from 2.0->2.0.1: Airtime instance is not avaiable for 1~2mins right after upgrade.	2012-02-12 15:31:17 -05:00
classmap-airtime-conf.php	SAAS-223: Airtime Usage Metric: Amount of time spent broadcasting	2012-05-11 16:06:28 -04:00
conf.php	CC-3732: NationTalk Database upgrade fail, from 2.0.3 to 2.1.0	2012-05-03 16:13:50 -04:00
constants.php	Merge branch '2.1.x' into devel	2012-07-16 14:31:03 -04:00
db-conf.php	CC-3694: Upgrade fails with Propel database conversion.	2012-04-20 15:37:51 -04:00
navigation.php	CC-3547 : Refactoring Views, removing action stack to better work with permissions. Reorganizing Statistics Dialog.	2012-03-29 15:34:58 +02:00