James
d7819b6dd2
CC-3489: Live Stream: When Custom Auth check box is checked, Custom
...
Username and Custom Password field must be required
- fixed spacing
2012-03-26 17:21:13 -04:00
James
e76f4baf18
CC-3489: Live Stream: When Custom Auth check box is checked, Custom Username and Custom Password field must be required
...
- done
2012-03-26 15:09:27 -04:00
Naomi Aro
275faa1881
CC-3504 : Adding a clip when nothing is playing should schedule the clip at the current time
2012-03-26 19:08:52 +02:00
Naomi Aro
7a6cdeaf10
CC-3174 : timeline
2012-03-26 12:36:06 +02:00
Naomi Aro
5facac4cd6
CC-3174 : timeline
2012-03-26 12:31:35 +02:00
Naomi Aro
91d44847cb
CC-3506 : Timeline: smaller columns for time values
2012-03-26 12:24:16 +02:00
Martin Konecny
0525f182ef
CC-3516: Creating a show has a long execution time
...
-grey out add-show form while busy
2012-03-25 22:56:51 -04:00
Naomi Aro
ac9fc9f665
CC-3436 : timeline usability
2012-03-23 18:54:03 +01:00
Naomi Aro
2f287274f6
CC-3463 : timeline usability
2012-03-23 18:33:40 +01:00
Naomi Aro
95f97ccc55
CC-3463 : Usability improvements for timeline
2012-03-23 18:27:47 +01:00
Naomi Aro
a77ac56621
CC-3463 : timeline usability
...
removing auto scrolling to now playing item, bad idea.
2012-03-23 16:46:08 +01:00
Naomi Aro
711d1f202a
CC-3463 : Usability of timeline
...
changing buttons to be jquery ui icons.
adding button to trim overbooked
adding button toscroll current item to top.
2012-03-23 16:42:08 +01:00
Naomi Aro
13bbdc327e
CC-3360 : timeline css
...
mistyped selector.
2012-03-23 01:56:56 +01:00
Naomi Aro
8af4f052e0
CC-3360 : timeline css
2012-03-23 01:46:45 +01:00
Naomi Aro
f1d76443ab
CC-3360 : timeline css
2012-03-23 00:11:49 +01:00
Naomi Aro
7ab0289d12
CC-3360 : timeline css
...
changed library search width calculation to be in library.js
2012-03-22 23:31:18 +01:00
Naomi Aro
da02bb7076
CC-3360 : Timeline Css
2012-03-22 19:15:39 +01:00
Naomi Aro
1fdb3cf163
CC-3360 : Timeline Css
...
adding Css to timeline.
2012-03-22 18:04:22 +01:00
Naomi Aro
e76cffd8b0
CC-3463 : timeline usability
...
moving multiple files within the timeline.
2012-03-20 17:55:35 +01:00
Naomi Aro
ff2907823b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-20 11:14:26 +01:00
Naomi Aro
642270998c
CC-3174 : showbuilder
...
adding semi colon.
2012-03-20 11:14:00 +01:00
James
e194ff0dc8
CC-3469: Stream settings: Connection URLs are not generated correctly
...
- done
2012-03-19 16:08:23 -04:00
Naomi Aro
8105c6571c
CC-3355 : Timeline/Library: Select all in the library, drag to empty show --> nothing is added
...
if something is added after a footer, it will be added to the end of whatever is before the footer.
2012-03-19 14:48:11 +01:00
Naomi Aro
970c2fc47a
CC-3453 : Playlist
...
fixing description
2012-03-19 14:21:34 +01:00
Naomi Aro
9509c70595
CC-3453 : Playlist
...
reworking inital playlist events to all use the new "on" delegation in jQuery.
fixing some out of date errors.
2012-03-19 14:09:05 +01:00
Naomi Aro
8925d44252
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-16 11:26:08 +01:00
Naomi Aro
d03e565861
CC-3174 : showbuilder
...
adding more length options to library, these ones should still fit without scrolling the page.
2012-03-16 11:26:03 +01:00
Daniel
5b953443c6
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/public/js/airtime/showbuilder/builder.js
2012-03-15 18:12:15 -04:00
Daniel
ae0d3c560c
CC-3394: Add play button to timeline table.
...
- added image information to row in ShowBuilder.php to enable audio preview of shows.
- moved around code so the audio preview functionaly is standalone
- fixed the firefox bug for issue CC-3429
2012-03-15 17:56:51 -04:00
james
04c2c2f920
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-15 14:29:48 -04:00
james
4595da9087
CC-3452: Live Stream: DJs assigned to the show and Program Managers should
...
be able to control switches and able to kick out connection
- kickout buttons and switch buttons are now visible to everyone.
- clicking buttons without correct permission will return proper error msg.
2012-03-15 14:29:31 -04:00
Naomi Aro
6409003b3f
CC-3174 : showbuilder
...
putting qtip on missing file alert.
2012-03-15 16:29:52 +01:00
Naomi Aro
7a8398bd32
CC-3174 : showbuilder
...
including context menu to delete items from timeline.
2012-03-15 16:11:29 +01:00
Naomi Aro
3019cb9c42
CC-3434 : playlist
...
changing image to be smaller.
2012-03-15 11:37:20 +01:00
Naomi Aro
94e5a3d423
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-14 20:10:22 +01:00
Naomi Aro
68a4443c36
CC-3174 : showbuilder
...
changing get to post.
2012-03-14 20:10:10 +01:00
James
c5c9fd7ba8
CC-3430: Live Stream: Admin should be able to kick out the source connection
...
- Clicking a button on UI triggers sending msg to pypo, which will lead running
'kick' command in liquidsoap.
2012-03-14 14:43:11 -04:00
James
2ee4b227fc
CC-3439: Live Stream: Only admin should be able to turn on/of switch and
...
able to see kick out button
- done
2012-03-14 14:43:11 -04:00
James
4eefc05366
CC-3427: Live Stream: Ability to switch off Scheduled Play
...
- done
2012-03-14 14:43:10 -04:00
James
e31ac81e74
CC-3418: Live Stream: Merge current "On-Air" indicator and "Listen"
...
button with new stream source indicator
- Initial commit
2012-03-14 14:43:10 -04:00
James
79f8eabe2b
CC-3405: Display to users how to connect a live stream to Airtime
...
- Done
2012-03-14 14:43:10 -04:00
James
efee025691
CC-3406: Live Stream: Switch off live sources on disconnection
...
- done
2012-03-14 14:43:10 -04:00
James
f193047a1c
CC-3367: Display in Now Playing whether Live DJ stream and Live Master stream
...
are connected and give user the ability to block those streams
- added stream source switch interface
- backend code
2012-03-14 14:43:10 -04:00
james
701ed82f40
CC-3224: "On-the-fly" stream rebroadcasting
...
- interface implementation. subform within the show form.
2012-03-14 14:41:00 -04:00
Naomi Aro
eb389d99d2
CC-3434 : Playlist Builder fast deleting
2012-03-14 17:50:48 +01:00
Daniel
0b82107d28
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-13 14:12:36 -04:00
Daniel
927e5033c8
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 detection of ogg or mp3 files
2012-03-13 14:12:14 -04:00
Naomi Aro
7e7820d366
CC-733 : broadcast logs
...
adding table scroll height.
2012-03-13 16:41:06 +01:00
Naomi Aro
6830af574a
CC-3174 : showbuilder
...
fixing some merge stuff.
2012-03-13 12:52:41 +01:00
Daniel
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
Daniel
c0b0e8079b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-12 11:33:28 -04:00
Naomi Aro
3145c24ba2
CC-3174 : showbuilder
...
changing queries for datatables to use the Datatables model class.
2012-03-12 15:32:24 +01:00
Daniel
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
Daniel
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
Naomi Aro
f28f6659dc
CC-3403 : Replace Now Playing with the new Timeline screen
2012-03-12 14:23:03 +01:00
Naomi Aro
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
Naomi Aro
20db8d6fdf
CC-733 : broadcast logs
...
adding time range selection for the log history.
2012-03-12 11:47:25 +01:00
Daniel
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
Naomi Aro
7c63387dd5
CC-733 : broadcast logs
...
adding the export table tools.
2012-03-09 13:39:12 +01:00
Naomi Aro
c66b55ec17
CC-733 : playout history
...
translating mDataProp values to be able to search table on backend
2012-03-09 11:13:32 +01:00
Naomi Aro
53b8eb2724
CC-733 : export broadcast logs
...
exporting stats based on czech law
2012-03-08 18:30:56 +01:00
Naomi Aro
7a5054655e
CC-3174 : showbuilder
...
change max-height slightly for the library dialog.
2012-03-08 11:14:09 +01:00
Naomi Aro
fe3c340a90
CC-3174 : showbuilder
...
making library table only scroll on the table part.
2012-03-07 18:27:32 +01:00
Naomi Aro
e9627bca07
CC-3174 : showbuilder
...
only updating the timeline view if it is needed.
2012-03-07 12:20:30 +01:00
Naomi Aro
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
Daniel
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
Naomi Aro
157078b963
Merge branch 'CC-3174' into devel
...
Conflicts:
airtime_mvc/public/js/airtime/library/library.js
2012-03-06 13:51:37 +01:00
Naomi Aro
64fe303b20
CC-3174 : showbuilder
...
fixing indentation.
2012-03-06 13:35:21 +01:00
Naomi Aro
6c5f710329
CC-3174 : showbuilder
...
making each separate widget scrollable (playlist, library, timeline)
2012-03-06 13:19:20 +01:00
Daniel
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
Daniel
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
Daniel
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
Daniel
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
Daniel
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
Daniel
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
Daniel
0b9ed43e50
Updated library functionality and started with playlist work.
2012-03-05 19:00:14 -05:00
Daniel
dd3b7afff2
Updated library so I can play a song.
2012-03-05 19:00:14 -05:00
Daniel
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
Naomi Aro
a832a40c75
CC-3174 : showbuilder
...
making the library a separate scrollable from playlist
2012-03-05 18:14:10 +01:00
Naomi Aro
b8ca0ef740
CC-3174 : showbuidler
...
fixing width of search input so it will work on smaller screens.
2012-03-05 15:39:18 +01:00
Naomi Aro
62c07107c1
CC-3174 : showbuilder
...
dialog improvements, can scroll library, builder independently.
2012-03-05 14:43:34 +01:00
Naomi Aro
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
Naomi Aro
f4fac98221
CC-3174 : showbuilder
...
adding back polling.
2012-03-02 17:25:44 +01:00
Naomi Aro
29b03c1181
CC-3174 : showbuilder
...
creating smart refresh timeout for now playing.
2012-03-02 16:27:14 +01:00
Naomi Aro
3ab375a23c
CC-3174 : showbuilder
...
chaning text on edit button.
2012-03-02 15:29:19 +01:00
Naomi Aro
b358c90cfb
CC-3174 : showbuilder
...
making the library toggle in when pressing the edit button
2012-03-02 15:28:04 +01:00
Naomi Aro
9e1b3e7e6e
CC-3174 : showbuilder
...
edge checking on empty datatables.
2012-03-02 14:16:11 +01:00
Naomi Aro
f61afb0216
CC-3373 : Timeline: only lock the currently playing track and the one after
2012-03-02 14:01:02 +01:00
Naomi Aro
b68204751e
CC-3174 : showbuilder
...
making sure recorded shows aren't editable.
2012-03-01 17:49:11 +01:00
Naomi Aro
1c43edb40b
CC-3174 : showbuilder
2012-03-01 17:05:50 +01:00
Naomi Aro
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
Naomi Aro
99b490129c
CC-3174 : showbuilder
...
making a dialog on the calendar page.
2012-03-01 00:19:59 +01:00
Naomi Aro
a8f53d169b
CC-3174 : showbuilder
...
sizing bit rate/sample rate in library, text right aligned.
2012-02-29 17:47:26 +01:00
Naomi Aro
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
Naomi Aro
0f91f91c41
CC-3174 : showbuilder
...
adding checks to enable/disable buttons for playlist & timeline.
2012-02-29 15:47:11 +01:00
Naomi Aro
5257711866
CC-3174 : showbuilder
...
fixing order of scheduled/playlist data when added via group dragging.
2012-02-28 23:52:20 +01:00
Naomi Aro
4386690b54
CC-3174 : showbuilder
...
prevents scheduling outside a show.
2012-02-28 20:58:06 +01:00
Naomi Aro
b5f510de85
CC-3174 : showbuilder
...
making sure an item is not added outside of a show.
2012-02-28 16:57:53 +01:00
Naomi Aro
9b639a9b6d
CC-3356 : Library & Timeline : remove zero prefixes from numbers
2012-02-28 15:38:57 +01:00
Naomi Aro
997782c73c
CC-3354 : playlist drag and drop
...
improving apperance of playlist drag and drop.
2012-02-28 13:13:40 +01:00