Commit Graph

73 Commits

Author SHA1 Message Date
Duncan Sommerville c3c4abdd0c Merge branch 'saas-dev' into saas-dev-publishing
Conflicts:
	airtime_mvc/public/css/dashboard.css
	airtime_mvc/public/css/styles.css
	airtime_mvc/public/js/airtime/library/library.js
	airtime_mvc/public/js/airtime/library/spl.js
2015-09-30 16:26:02 -04:00
Duncan Sommerville 2ee7e4bf71 SAAS-1088 - move 'All My Shows' checkbox to dropdown instead 2015-09-30 11:38:33 -04:00
Duncan Sommerville 3df1081c60 SAAS-1088 - fix broken 'all my shows' checkbox 2015-09-29 15:51:09 -04:00
Duncan Sommerville a24565669b Fix bug where library would sometimes reference wrong table 2015-09-24 15:55:37 -04:00
Duncan Sommerville 4238d5a201 Refactor tabs functionality 2015-09-22 15:27:08 -04:00
Duncan Sommerville 6900af8d47 Fix bug where switching from #podcast to other media view would not work as intended 2015-09-18 15:37:41 -04:00
Albert Santoni 71919ad529 Basic integration of table widget into Dashboard podcasts view 2015-09-16 18:32:16 -04:00
Duncan Sommerville 8dcea06077 * Move tab functionality to a separate module
* Fix broken library placeholders
* Restrict tab width and add text panning to tab name
* General bugfixing and cleanup of tab functionality
2015-09-15 18:53:25 -04:00
Duncan Sommerville 893d60ed44 Revert "SAAS-1061 - implement podcast list view skeleton; small bugfixes"
This reverts commit 0fcf6a8dac.
2015-09-14 18:29:43 -04:00
Duncan Sommerville 8c65ba8f66 SAAS-1061 - implement podcast list view skeleton; small bugfixes
Conflicts:
	airtime_mvc/public/js/airtime/library/library.js
2015-09-14 18:29:13 -04:00
Duncan Sommerville 0fcf6a8dac SAAS-1061 - implement podcast list view skeleton; small bugfixes 2015-09-14 18:26:28 -04:00
Duncan Sommerville ef892bb565 Fix some small bugs with Dashboard navigation links 2015-08-26 17:02:01 -04:00
Duncan Sommerville 84baef1996 CC-6097, CC-6091, CC-6080, CC-6066 - css fixes and more work on add/remove content screen 2015-08-25 17:09:05 -04:00
Duncan Sommerville e6761b54da CC-6066 - more work on add/remove content screen 2015-08-24 12:05:57 -04:00
Albert Santoni a84c33f0ed Cleanup and fix media type selector highlight in calendar page 2015-08-18 17:29:23 -04:00
Duncan Sommerville 3f25ab2647 CC-6079 - merge and remove underscore files 2015-08-18 15:23:42 -04:00
Duncan Sommerville 8b380086c3 Merge branch 'saas-dev' into saas-speedy 2015-05-04 13:09:51 -04:00
Albert Santoni f382b1338f Layout fixes for library and Now Playing screens 2015-04-29 13:41:52 -04:00
Albert Santoni f3c8f40183 Tweaks to fix up my optimizatinos
* Fixed a rendering glitch with empty shows in the Now Playing screen
* Changed drag and drop placeholder to show the track name. Reverted it
  from the default DataTables placeholder, which unfortunately gets the
  column widths wrong.
2015-04-14 17:39:52 -04:00
Albert Santoni b11e98ea24 Reduced the Now Playing screen AJAX on load from 9 to 2. 2015-04-10 19:52:06 -04:00
Naomi 8d2926aeed CC-5727 : History search range using incorrect timezone offset (also Nowplaying)
sending the timestamp string back for nowplaying as well.
added error class to history page if end is < start.
2014-03-10 18:33:07 -04:00
denise 632b11c0ab CC-5331: Now Playing keeps refreshing sometimes
- typo in GET request parameters causing overriding of data
2013-10-01 16:49:08 -04:00
Naomi Aro 7e96828cdd CC-5317 : Guest user can't see Now playing page
removed the library module completely from page if the user does not have permission to view it.
2013-09-24 12:21:04 +02:00
Naomi 01f835c4c4 CC-4504 : Double scrollbars in Library view 2013-06-10 15:50:33 -04:00
Naomi 408ecc530d CC-3822 : NowPlaying-> Time filter is allowing Start_Time be greater than the End_Time 2013-05-27 14:37:16 -04:00
Martin Konecny bb36556bb9 IM-629
-filter by using instance id instead of show id

Conflicts:
	airtime_mvc/application/models/Schedule.php
2013-05-14 19:18:08 -04: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
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
denise dffe932223 Added missing base directory to urls 2013-01-10 13:58:11 -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 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
denise fdd889d7a8 - fixed formatting 2012-10-29 12:09:11 -04:00
denise d32495d100 CC-2184: Hardcoded CSS path should be relative path instead 2012-10-19 11:09:34 -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 8f48544bb7 -implemented UI changes for Now Playing page 2012-09-13 17:10:38 -04:00
denise 79513de1ba CC-4035: Timeline -> Filter by show: please let the setting automatically takes effect without clicking the button out of the 'box'
-also added this functionality for the 'All my shows' checkbox
2012-06-28 17:07:01 -04:00
denise 61fc269b13 CC-4035: Timeline -> Filter by show: please let the setting automatically takes effect without clicking the button out of the 'box'
-done
2012-06-28 16:55:43 -04:00
denise d892a4b5ae CC-4009: Calendar icon cannot be clicked twice without clicking another icon first
-fixed
2012-06-26 16:43:36 -04:00
Naomi Aro 4fe80194b6 CC-3845 : General UI cleanup 2012-05-21 17:07:34 +02:00
Naomi Aro ff1327881a CC-3845 : General UI cleanup 2012-05-18 15:40:22 +02:00
Naomi Aro 96d2f657f7 CC-3741 : Timeline's cursors looks a little bit far from timeline 2012-05-04 15:49:05 +02:00
Naomi Aro b5b24ae8f1 CC-3735 : Now Playing: Browser(Firefox) Mem usage goes high when play a show with hundreds of songs more than 3 hours 2012-05-02 11:14:53 +02:00
Naomi Aro b5863d3d7a CC-3522 : Now Playing Screen-> Periodical message pops up 2012-04-26 12:14:41 +02:00