sintonia/airtime_mvc/application/views/scripts
Martin Konecny 9609a4e220 Merge branch 'cc-4652' of https://github.com/rgrinberg/Airtime into devel
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/views/scripts/library/library.phtml
	airtime_mvc/public/js/airtime/showbuilder/main_builder.js
2012-11-02 20:16:54 -04:00
..
airtime-recorder 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
api remove \r line endings 2012-10-30 13:23:09 -04:00
audiopreview CC-4570: blockId and blockIndex are visible at top of smart block preview pop-up 2012-10-16 14:51:14 -04:00
dashboard CC-2184: Hardcoded CSS path should be relative path instead 2012-10-19 11:09:34 -04:00
error CC-2992: 404 "Help" link doesnt work 2011-11-15 16:37:41 -05:00
form Merge branch 'cc-4652' of https://github.com/rgrinberg/Airtime into devel 2012-11-02 20:16:54 -04:00
index 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
library Merge branch 'cc-4652' of https://github.com/rgrinberg/Airtime into devel 2012-11-02 20:16:54 -04:00
login Fixed typo in password restore message 2012-10-09 14:21:58 +01:00
partialviews CC-3712 : Trial end date overlaps with Airtime Clock 2012-05-22 12:40:08 +02:00
playlist CC-4590: New smart block says 'Empty playlist' 2012-10-29 11:57:20 -04:00
playouthistory CC-3712 : Trial end date overlaps with Airtime Clock 2012-05-22 12:45:42 +02:00
plupload CC-2748: Make Airtime look good in IE 2011-10-03 15:27:10 -04:00
preference CC-4583: Use AJAX calls instead of refreshing entire page 2012-10-26 18:09:30 -04:00
recorder 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
schedule remove \r line endings 2012-10-30 13:23:09 -04:00
showbuilder CC-4646: Library: Make advanced search options hidden by default 2012-10-30 11:59:52 -04:00
systemstatus CC-2363: Diagnostic screen in Web UI 2011-09-22 10:45:43 -04:00
user Remove unused function 2012-08-30 16:30:49 -04:00
webstream CC-4577: Webstream UI: little improvement about 'SAVE' button and input boxes for URL and length 2012-10-30 13:02:55 -04:00
menu.phtml CC-2654: corrected spelling 2011-09-07 16:19:35 -04:00