Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,506 Commits 3 Branches 0 Tags 405 MiB
Commit Graph

261 Commits

Author SHA1 Message Date
Martin Konecny 86f3985c03 CC-5206: 
Calender: "Empty show" icon doesn't change after filling contents unless manually refresh page

fixed
 2013-06-04 14:52:26 -04:00
Naomi Aro 4d1a15b7ca CC-3817 : Should use soundcloud icon for recorded & uploaded shows in timeline for past shows to match calendar 2013-05-28 14:27:59 -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
Naomi 3ad7c868e2 Merge branch 'SAAS-317-datatables-reorder' into 2.4.x 2013-05-21 17:44:25 -04:00
Naomi b720086a4b SAAS-317 : http://ryerson.airtime.pro/ is having issues with show/hide column in their library 
missing single quote problem, updating column visible plugin.
 2013-05-21 17:40:52 -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
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
denise 8f48544bb7 -implemented UI changes for Now Playing page 2012-09-13 17:10:38 -04:00
Martin Konecny eb4c23b0b6 CC-1665: Scheduled stream rebroadcasting and recording 
-Fix scheduled streams mixed with scheduled files
 2012-07-26 14:49:32 -04:00
James 78acd4f805 CC-4093: Timeline -> Alert for deleting track(s) appears twice by clicking 
context menu

- fixed
 2012-07-10 13:08:36 -04:00
denise 87afea63bf CC-4065: Timeline -> Cursor will disappear after a track is finished sometimes 
-fixed
 2012-07-03 18:22:48 -04:00
denise f6d79b1f54 CC-4063: Timeline -> Add a track to a show will cause another show's cursor to be selected 
-fixed
 2012-07-03 14:52:27 -04:00
denise e11fe8a2b8 CC-4058: Timeline -> Cannot add song twice if last cursor is selected 
-fixed
 2012-07-03 12:42:53 -04:00
denise bc569462ee CC-4057: Calendar -> Add/Remove contents: Lost cursor after add contents to a show 
-fixed
 2012-07-03 11:48:57 -04:00
denise 46604fdf59 CC-4046: Timeline -> cannot drag and drog song into the posion between song's name and "show empty" 
-fixed
 2012-06-29 16:59:03 -04:00
denise 68420a898f CC-4044: Timeline -> Cursor keeps highlight even if the song is played 
-fixed
 2012-06-29 15:49:22 -04:00
denise 38cb439f53 CC-4036: Timeline -> A new Cursor will be selected when there are 2 shows and we add/delete items in timeline view 
-fixed
 2012-06-28 17:55:17 -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 9fb9fb3219 CC-4021: Media Library -> "+" button wont take effect if uncheck one and check another 
-fixed
 2012-06-27 17:19:55 -04:00
denise 12bf42d2f1 CC-4031: Timeline cursor vanishes when every once in a while 
-fixed
 2012-06-27 15:50:56 -04:00
Martin Konecny 0a0e873ef9 CC-4019: Library: When "Add content" is clicked, "Proccessing" image … 
-fix small comment typo
 2012-06-27 11:50:31 -04:00
James 31d643cee1 CC-3997: Now Playing -> Time Line: different behaviour between 'delete' 
button and 'delete' menu items

- added confirm box on clicking delete button on now playing table
- also added confirm box on library delete button as well
 2012-06-26 17:43:15 -04:00
James 576c13963d CC-3998: Now Playing -> Time Line: confirm message for user 'delete' 
track by context menu is misleading

- fixed
 2012-06-26 17:35:07 -04:00
James c2cc4253b3 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-26 16:56:01 -04:00
James 9a14051f0b CC-4019: Library: When "Add content" is clicked, "Proccessing" image is keep 
flickering

- fixed
 2012-06-26 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
denise ca3d554c07 CC-3983: Timeline cursor in Now Playing vanishes after adding a file to a show 
-empty cursorId array after every callback
 2012-06-26 15:49:17 -04:00
denise 05fa673e42 CC-3983: Timeline cursor in Now Playing vanishes after adding a file to a show 
-done
 2012-06-26 15:36:45 -04:00
James 3a32e7240a CC-3984: Now Playing scissor and trashcan buttons are incorrectly labelled in 
tooltips

- fixed
 2012-06-20 16:49:41 -04:00
denise 8a63478c73 CC-3972: it is not possible to select tracks in Now Playing tab 
-fixed
 2012-06-12 14:58:33 -04:00
denise 8fae454db6 CC-3901: DJ not assigned to Show, Guest: selection dialog populated upon clicking on "Select All" button in Now Playing 
-fixed
 2012-06-07 17:04:31 -04:00
denise 9c89d263db CC-3880: NowPlaying-> there is no tooltip for the removed files available 
-done
 2012-06-05 11:20:00 -04:00
denise c554190faf -fixed indentation 2012-06-05 11:20:00 -04:00
Naomi Aro 1a49173d2f CC-3860 : Timeline: Can knock a current playing song out of place with drag and drop if current playing song has checkbox selected 2012-05-30 17:46:24 +02:00
Naomi Aro d91850b1ca CC-3877 : Now Playing-> Show manipulation buttons should be disabled for guest user and DJ's who are not assigned to the show 2012-05-24 18:10:36 +02:00
Naomi Aro 1b115178d3 CC-3877 : Now Playing-> Show manipulation buttons should be disabled for guest user and DJ's who are not assigned to the show 2012-05-24 15:50:29 +02:00
Naomi Aro 0c233c3346 CC-3860 : Timeline: Can knock a current playing song out of place with drag and drop if current playing song has checkbox selected 2012-05-23 17:06:04 +02:00
Naomi Aro 0b84dec86f CC-3862 : Now playing -> Time Line: Left clicking and "Select cursor" won't enable to add current selected track from Media Library 2012-05-23 12:18:51 +02: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 07d029b8cc CC-3777 : Decide on what should happen with canceling recorded show 2012-05-15 14:56:31 +02:00
Naomi Aro ff5aebfd6b CC-3817 : Should use soundcloud icon for recorded & uploaded shows in timeline for past shows to match calendar 2012-05-14 15:06:56 +02:00
Naomi Aro 4e2aee83fd CC-3806 : "n" of Add n items increases unexpectly 2012-05-11 11:04:16 +02:00
Naomi Aro e61924de37 CC-3799 : Dragging and dropping a track from the library causes the track in the library to be selected 2012-05-10 14:19:36 +02:00
Naomi Aro a79514c8ee CC-3687 : Remove context menus from recorded shows since they are blank. 2012-05-07 15:24:06 +02:00
Naomi Aro a4b949cc2f CC-3753 : Cannot cancel record show on Timeline view 2012-05-07 14:28:21 +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 edaec54a5d CC-3724 : Now Playing -> Timeline view: to drag and drop single file very fast will block adding the same file 
using jquery.blockUI.js on timeline/playlist builder pages.
 2012-05-04 15:00:18 +02:00
Naomi Aro 0a17b34885 CC-3735 : Now Playing: Browser(Firefox) Mem usage goes high when play a show with hundreds of songs more than 3 hours 2012-05-03 18:00:10 +02:00
Naomi Aro c2c6e1b114 CC-3735 : Now Playing: Browser(Firefox) Mem usage goes high when play a show with hundreds of songs more than 3 hours 
updating datatables to stable 1.9.1 release.

optimizing javascript, using jquery to add/remove nodes to avoid JQuery.cache issues.
 2012-05-03 15:04:23 +02:00