Naomi fe20cc7f63 Merge branch '2.5.x' into cc-5709-airtime-analyzer ...

Conflicts:
	airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
	airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
	airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po

2014-04-23 15:58:39 -04:00

..

colorpicker

remove \r line endings

2012-10-30 13:23:09 -04:00

datatables

CC-3857: Chmod fixes for files which should not be executable

2012-05-22 11:22:43 -04:00

images

changing to context menu single edit/delete.

2013-08-19 23:19:13 -04:00

img

Added Bootstrap CSS, images and JS for new buttons and dropdown menues

2012-09-12 21:23:25 +02:00

qtip

CC-84: Smart Playlists

2012-08-01 14:43:52 -04:00

redmond

Alert icon for missing file in Now Playing should be orange, to match Media Builder

2013-09-25 17:36:50 +01:00

tipsy

CC-2258: Describe rights for each user type on the user page

2012-12-13 12:29:02 -05:00

add-show.css

remove \r line endings

2012-10-30 13:23:09 -04:00

addmedia.css

CC-5709: Airtime Analyzer

2014-04-01 16:40:54 -04:00

bootstrap-datetimepicker.min.css

dynamic form rendering for template

2013-07-26 17:33:17 -04:00

bootstrap.css

Fixes whitespace to the left of 'Open Media Builder' button (CC-5166)

2013-05-22 10:23:42 +01:00

fullcalendar-old.css

needed to update jquery, fullcalendar needed updating for the new JS.

2013-07-29 08:57:31 -04:00

fullcalendar.css

downgrading full calendar (too much to do the necessary updates at the moment) but still an upgrade from 2.4.x

2013-08-09 15:52:22 -04:00

history_styles.css

CC-5727 : History search range using incorrect timezone offset (also Nowplaying)

2014-03-10 18:33:07 -04:00

jquery-ui-timepicker-addon.css

converting to a jquery UI based datepicker.

2013-08-16 15:12:00 -04:00

jquery.contextMenu.css

CC-5309:Calendar-> Recording Show: Fail to open context menu

2013-08-23 14:23:47 -04:00

jquery.ui.timepicker.css

remove \r line endings

2012-10-30 13:23:09 -04:00

library_search.css

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

masterpanel.css

Revert "CC-4980: Create graphic with 4 switches for Airtime Dashboard"

2013-02-27 14:35:35 -05:00

media_library.css

- putting scroll bar on library left pane

2012-09-17 12:28:46 -04:00

playlist_builder.css

CC-5108 Waveform Editor UI

2013-05-13 16:01:06 -04:00

playouthistory.css

CC-5732 : History -> Playout History: live chat banner blocks navigator buttons

2014-03-13 12:37:56 -04:00

plupload.queue.css

remove \r line endings

2012-10-30 13:23:09 -04:00

pro_dropdown_3.css

remove \r line endings

2012-10-30 13:23:09 -04:00

showbuilder.css

CC-3822 : NowPlaying-> Time filter is allowing Start_Time be greater than the End_Time

2013-05-27 14:37:16 -04:00

styles.css

CC-5786: Quota Enforcement in the File Upload API

2014-04-14 11:24:39 -04:00

TableTools_JUI.css

CC-3857: Chmod fixes for files which should not be executable

2012-05-22 11:22:43 -04:00

TableTools.css

CC-3857: Chmod fixes for files which should not be executable

2012-05-22 11:22:43 -04:00

users.css

CC-3845 : General UI cleanup

2012-05-18 16:01:24 +02:00

waveform.css

CC-5108 : Waveform Editor UI

2013-05-23 18:33:40 -04:00