09b5d9003b
CC-3395 Play preview for playlists and timelines for shows should show a list under the pop-up player which will play the entire playlist.
...
- Updated library.js because I lost my changes during merge
2012-03-12 11:57:30 -04:00
c0b0e8079b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-12 11:33:28 -04:00
3145c24ba2
CC-3174 : showbuilder
...
changing queries for datatables to use the Datatables model class.
2012-03-12 15:32:24 +01:00
d713f830cd
CC-3395: Play preview for playlists and timelines for shows should show a list under the pop-up player which will play the entire playlist.
...
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/public/js/airtime/library/library.js
2012-03-12 10:23:50 -04:00
48aeaaf05a
CC-3395: Play preview for playlists and timelines for shows should show a list under the pop-up player which will play the entire playlist.
...
- merging with devel
2012-03-12 10:20:58 -04:00
f28f6659dc
CC-3403 : Replace Now Playing with the new Timeline screen
2012-03-12 14:23:03 +01:00
3b32a16813
CC-3174 : showbuilder
...
setting a timeout to refresh when the first item on the timeline starts incse there is no "current" item.
2012-03-12 13:25:03 +01:00
20db8d6fdf
CC-733 : broadcast logs
...
adding time range selection for the log history.
2012-03-12 11:47:25 +01:00
470cf0dbf8
CC-3395: Play preview for playlists and timelines for shows should show a list under the pop-up player which will play the entire playlist.
...
- Updated jplayer so it now shows a list view under the player which shows details of the track being played, and for playlists the entire playlist list.
- Also enabled playing playlists from the library.
2012-03-09 18:47:08 -05:00
7c63387dd5
CC-733 : broadcast logs
...
adding the export table tools.
2012-03-09 13:39:12 +01:00
c66b55ec17
CC-733 : playout history
...
translating mDataProp values to be able to search table on backend
2012-03-09 11:13:32 +01:00
53b8eb2724
CC-733 : export broadcast logs
...
exporting stats based on czech law
2012-03-08 18:30:56 +01:00
7a5054655e
CC-3174 : showbuilder
...
change max-height slightly for the library dialog.
2012-03-08 11:14:09 +01:00
fe3c340a90
CC-3174 : showbuilder
...
making library table only scroll on the table part.
2012-03-07 18:27:32 +01:00
e9627bca07
CC-3174 : showbuilder
...
only updating the timeline view if it is needed.
2012-03-07 12:20:30 +01:00
a4d07b3060
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/public/js/airtime/library/library.js
2012-03-07 10:33:00 +01:00
709e117f41
CC-3391: Audio Preview cannot play tracks with commas in their filename
...
- The content distribution header filename attribute, wasn't properly quoted for inline content. This causes a bug for files with comma names.
- changed the play button in library back to the speaker icon
- removed some dead code preview_player.js
- removed the file name attribute, will need better approch to presenting the user with audio information.
2012-03-06 13:50:07 -05:00
157078b963
Merge branch 'CC-3174' into devel
...
Conflicts:
airtime_mvc/public/js/airtime/library/library.js
2012-03-06 13:51:37 +01:00
64fe303b20
CC-3174 : showbuilder
...
fixing indentation.
2012-03-06 13:35:21 +01:00
6c5f710329
CC-3174 : showbuilder
...
making each separate widget scrollable (playlist, library, timeline)
2012-03-06 13:19:20 +01:00
a09b63b8d0
CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
...
- removed javascript from php files
- removed preview.js
- fixed small problems with editor
2012-03-05 19:00:14 -05:00
a246f85a5b
CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
...
- Merged with devel, removed js from StoredFile.php
2012-03-05 19:00:14 -05:00
51f004933b
CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
...
- updated icon in library
2012-03-05 19:00:14 -05:00
aacbac4757
CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
...
- Updated functionality so user can play a track and in jplayer and jump around it.
2012-03-05 19:00:14 -05:00
7d95e4ffa7
CC-2430 : Preview tracks in the library + better preview (ability to jump around in clip)
...
- added accept ranges header to the response to enable seek ahead in the music file.
2012-03-05 19:00:14 -05:00
1aab682104
CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
...
- updates to audio preview on library and playlist
2012-03-05 19:00:14 -05:00
0b9ed43e50
Updated library functionality and started with playlist work.
2012-03-05 19:00:14 -05:00
dd3b7afff2
Updated library so I can play a song.
2012-03-05 19:00:14 -05:00
6ff24bd1fd
Updated Library logic so I can play a song in the library.
...
Still need to be able to get the song file from the element and
update the playlist builder so its player respects cuein/cueout and fadein/fadeout
2012-03-05 19:00:14 -05:00
a832a40c75
CC-3174 : showbuilder
...
making the library a separate scrollable from playlist
2012-03-05 18:14:10 +01:00
b8ca0ef740
CC-3174 : showbuidler
...
fixing width of search input so it will work on smaller screens.
2012-03-05 15:39:18 +01:00
62c07107c1
CC-3174 : showbuilder
...
dialog improvements, can scroll library, builder independently.
2012-03-05 14:43:34 +01:00
59b7f4ab56
CC-3174 : showbuilder
...
adding timeout for the now playing song, as well as polling every 20 seconds.
2012-03-02 18:16:44 +01:00
f4fac98221
CC-3174 : showbuilder
...
adding back polling.
2012-03-02 17:25:44 +01:00
29b03c1181
CC-3174 : showbuilder
...
creating smart refresh timeout for now playing.
2012-03-02 16:27:14 +01:00
3ab375a23c
CC-3174 : showbuilder
...
chaning text on edit button.
2012-03-02 15:29:19 +01:00
b358c90cfb
CC-3174 : showbuilder
...
making the library toggle in when pressing the edit button
2012-03-02 15:28:04 +01:00
9e1b3e7e6e
CC-3174 : showbuilder
...
edge checking on empty datatables.
2012-03-02 14:16:11 +01:00
f61afb0216
CC-3373 : Timeline: only lock the currently playing track and the one after
2012-03-02 14:01:02 +01:00
b68204751e
CC-3174 : showbuilder
...
making sure recorded shows aren't editable.
2012-03-01 17:49:11 +01:00
1c43edb40b
CC-3174 : showbuilder
2012-03-01 17:05:50 +01:00
3bfbe036c7
CC-3174 : showbuilder
...
using the new status column in cc_schedule to colour boundary/overbooked tracks.
2012-03-01 15:09:13 +01:00
99b490129c
CC-3174 : showbuilder
...
making a dialog on the calendar page.
2012-03-01 00:19:59 +01:00
a8f53d169b
CC-3174 : showbuilder
...
sizing bit rate/sample rate in library, text right aligned.
2012-02-29 17:47:26 +01:00
bc1d519408
CC-3174 : showbuilder
...
showing message if some files could not be deleted since they were scheduled.
2012-02-29 16:02:41 +01:00
0f91f91c41
CC-3174 : showbuilder
...
adding checks to enable/disable buttons for playlist & timeline.
2012-02-29 15:47:11 +01:00
5257711866
CC-3174 : showbuilder
...
fixing order of scheduled/playlist data when added via group dragging.
2012-02-28 23:52:20 +01:00
4386690b54
CC-3174 : showbuilder
...
prevents scheduling outside a show.
2012-02-28 20:58:06 +01:00
b5f510de85
CC-3174 : showbuilder
...
making sure an item is not added outside of a show.
2012-02-28 16:57:53 +01:00
9b639a9b6d
CC-3356 : Library & Timeline : remove zero prefixes from numbers
2012-02-28 15:38:57 +01:00
Daniel
Naomi Aro