Commit Graph

205 Commits

Author SHA1 Message Date
denise 71526a94cc Merge branch 'cc-4961-show-linking'
Conflicts:
	airtime_mvc/application/controllers/ScheduleController.php
2013-04-29 15:35:16 -04:00
denise a9b5d00d87 CC-4961: Show linking 2013-04-18 16:12:26 -04:00
Martin Konecny d46fef8eda SAAS-301: Calendar content indicator did not update automatically after adding content to a show
-fixed
2013-04-11 15:11:20 -04:00
Martin Konecny 3714f83757 Merge branch '2.3.x' 2013-04-11 15:06:21 -04:00
Martin Konecny 3000f543d8 SAAS-301:
Calendar content indicator did not update automatically after adding content to a show

-fixed
2013-04-11 15:04:16 -04:00
Naomi 542553bbc1 Merge branch '2.3.x' into devel 2013-02-15 17:05:36 -05:00
Naomi 9a2b8af7b1 Revert "CC-4955: Datatables saves its parameters twice on every page load"
This reverts commit 39ec07e71c.
2013-02-15 16:50:43 -05:00
Martin Konecny 39ec07e71c CC-4955: Datatables saves its parameters twice on every page load
-fixed
2013-02-15 14:18:32 -05:00
Martin Konecny b30f67b24b CC-4950: builder-feed is called twice on NowPlaying screen load 2013-02-14 15:49:38 -05:00
Martin Konecny bb7e56e39e CC-4943: Raspberry Pi optimization: don't create new background AJAX request until the previous one has returned
-fixed
2013-02-14 12:58:31 -05:00
denise eb38503d6e CC-4946: Now Playing -> Apache error when empty show starts
-we were trying to update the is_scheduled flag on a non-schedule item
2013-02-13 11:51:25 -05:00
denise 4ff1e8e78a CC-4932: Library -> Update Scheduled column on 'Cancel current show' action
-fixed
2013-02-13 11:29:43 -05:00
denise 525b2dcb33 CC-4895: Remove all json die() statements from code
- removed json_encode
2013-02-07 15:41:47 -05:00
denise 0ed5d18e95 CC-4920: Now Playling js error
-fixed
2013-02-06 13:25:48 -05:00
denise 8309593a0f CC-4904: Library -> Sort by status doesn't work
- added 2 columns to cc_files (is_scheduled, is_playlist)
- split library status column into two columns (scheduled, playlist)
- is_scheduled gets updated when a track plays out, or when a file gets added/removed from/to a show
- is_playlist gets updated when a file gets added/removed from/to a playlist/block, when a playlist/block gets deleted, or when a playlist/block's contents is cleared
2013-02-01 17:47:07 -05:00
denise e1c69ebca2 CC-4902: Library -> Status column does not update when you add a file to a show
-fixed
2013-01-31 11:28:54 -05:00
Martin Konecny fae3f3a03f CC-2184: Hardcoded CSS path should be relative path instead
-Make '/' the default root
2013-01-14 16:00:38 -05:00
Martin Konecny 3a70a371be CC-4751: Calendar: Add/Remove contents won't trig status update of shows
-fix problem when baseurl changed
2013-01-14 14:07:32 -05:00
Martin Konecny 2bbdb01495 CC-4751: Calendar: Add/Remove contents won't trig status update of shows
-fixed
2013-01-11 15:37:58 -05:00
denise dffe932223 Added missing base directory to urls 2013-01-10 13:58:11 -05:00
denise 22bfc45497 CC-1960: Internationalize Airtime / Support translations
-defined translations for show builder datatable
2012-11-27 15:51:50 -05:00
denise b677130a3f CC-1960Internationalize Airtime / Support translations
-added gettext wrapper to strings missing it
-timepicker close button was not getting translated -fixed
2012-11-23 16:39:41 -05:00
denise dd0e71efcc CC-1960: Internationalize Airtime / Support translations
-added gettext wrapper function to all strings missing it
-i18n of jquery timepicker and datepicker
-i18n of jquery datatables columnFilter input place holder labels
2012-11-22 17:32:24 -05:00
denise 10cd31fa56 CC-1960: Internationalize Airtime / Support translations
- channged all js strings with embedded variables to use sprintf
2012-11-20 17:42:26 -05:00
denise 57fdab0ddf CC-1960: Internationalize Airtime / Support translations
-added i18n jquery library
-created a Locale controller that returns a js dictionary of translations needed in js
-added jquery i18n wrapper function to all strings in js
2012-11-20 11:33:37 -05:00
denise a201d6f2da CC-4666: Showbuilder page is dead
-fixed. result of a bad merge
2012-11-05 11:15:26 -05:00
denise 135aadf16b Merge branch '2.2.x' into devel
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/views/scripts/library/library.phtml
	airtime_mvc/public/js/airtime/showbuilder/builder.js
	airtime_mvc/public/js/airtime/showbuilder/main_builder.js
2012-11-02 12:28:21 -04:00
James 575400b4c2 CC-4623: Library: Preview button for Flac does not work
- fixed
2012-11-01 16:44:37 -04:00
denise 00947f9d7e CC-4640: Automatically jump to current song when loading the Now Playing page.
-small fix
2012-10-30 15:34:38 -04:00
denise b08f5091b5 CC-4609: Calendar -> Add/Remove contents: Please remove useless buttons: 'Jump to current playing song' and 'Cancel current show'
-done
2012-10-30 11:18:11 -04:00
denise d97afabaea CC-4640: Automatically jump to current song when loading the Now Playing page.
-added check to see if a show is currently playing
2012-10-29 15:40:58 -04:00
denise 332f9993c0 CC-4640: Automatically jump to current song when loading the Now Playing page.
-done
2012-10-29 15:20:16 -04:00
denise fdd889d7a8 - fixed formatting 2012-10-29 12:09:11 -04:00
denise f30d636b17 CC-4581: Confirmation dialog for removing an item from a show refers to deletion 2012-10-19 16:19:32 -04:00
Martin Konecny d5c2c37a3e Revert "CC-4605: Some AJAX calls are cached"
This reverts commit ffca5b42a8.
2012-10-19 11:16:42 -04:00
denise d32495d100 CC-2184: Hardcoded CSS path should be relative path instead 2012-10-19 11:09:34 -04:00
Martin Konecny ffca5b42a8 CC-4605: Some AJAX calls are cached 2012-10-19 11:07:37 -04:00
Daniel James a103c76378 CC-4558: Make button in Now Playing consistent with same action in Calendar 2012-10-15 12:27:16 +01:00
Martin Konecny 5a8510b909 remove gap on right side of show builder: part 3 2012-09-19 17:22:04 -04:00
Martin Konecny 84ed03ffac remove gap on right side of show builder: part 2 2012-09-19 16:55:44 -04:00
Martin Konecny a3b53ee3d3 remove gap on right side of show builder 2012-09-19 16:19:02 -04:00
denise 9c721f202f -small UI improvement 2012-09-18 11:05:13 -04:00
denise 1698aae251 CC-4466: Buttons on Now Playing page are clickable even though they are disabled
-fixed
2012-09-18 10:53:19 -04:00
Naomi Aro bb3ffce071 CC-3944 : Now Playing -> Time Line view: Cannot cancel record show, cancel button is disabled 2012-09-17 16:28:28 -07:00
denise f840a9b24a CC-4451: (Firefox) Now Playing -> Can't cancel Current Show
-fixed
2012-09-17 12:30:43 -04:00
denise f02bf04a25 CC-4449: (Firefox) Now Playing -> Cancel currently playing track does not work
-fixed
2012-09-17 12:27:17 -04:00
denise b8b3bfb495 CC-4450: Now Playing -> Can't remove overbooked tracks
-fixed
2012-09-17 12:23:49 -04:00
denise e30d3b770c -removed unused code 2012-09-17 12:19:02 -04:00
denise 3c3b39796d CC-4445: Timeline: 'Select' dropdown menu should be disabled if the button is disabled
-fixed
2012-09-17 12:10:23 -04:00
denise 99969ff19d CC-4445: Timeline: 'Select' dropdown menu should be disabled if the button is disabled
-fixed
2012-09-17 11:58:05 -04:00