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
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
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
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
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
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