Commit Graph

1355 Commits

Author SHA1 Message Date
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 3ab8c3d57b Merge branch 'CC-3174' into devel 2012-03-23 16:42:40 +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
James 1ccf63ab0b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-22 16:24:38 -04:00
James f8d3a8c8bb CC-3449: Live Stream: Kick out live dj at the end of the show
- PHP side implementation
2012-03-22 16:23:59 -04:00
James 24260e8908 CC-3408: Live Stream: Check if the selected port is available to use
- done
2012-03-22 16:21:23 -04: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
James b4e9f9699c CC-3483: Live Stream: default fade in/out for live stream transition
- take care of bootstrap of pypo
2012-03-20 22:29:52 -04:00
James 6b768c2f99 CC-3483: Live Stream: default fade in/out for live stream transition
- done. changing fade value doesn't require LS to restart
2012-03-20 22:16:17 -04:00
Daniel 4bb0421cf7 CC-3429: Firefox does not natively support mp3 file playing so preview does nothing.
- removed useless logging in AudiopreviewController.php.
- updated if statement syntax in audio-preview.phtml according to review comments.
2012-03-20 18:46:48 -04:00
James d4142f8b8b CC-3484: Pypo: On bootup, it should grab station name and stream
label for liquidsoap

- fixed
- created new function set_bootstrap_variables()
2012-03-20 16:41:15 -04: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
Martin Konecny 2d6e6b82aa Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-19 17:35:38 -04:00
Martin Konecny d7b05827e6 CC-3477: Apache complains the # symbol is deprecated. Use ; instead
-done
2012-03-19 17:35:20 -04:00
Daniel 064f7cf591 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-19 16:14:16 -04:00
Daniel acf0eb4eb2 CC-3429: Firefox does not natively support mp3 file playing so preview does nothing.
- updated the logic in jplayer to include supplied m4v, but hide the video viewer through the size option.
2012-03-19 16:09:59 -04:00
James e194ff0dc8 CC-3469: Stream settings: Connection URLs are not generated correctly
- done
2012-03-19 16:08:23 -04:00
James b7634098d3 CC-3471: Stream setting page looks much worse in Chrome than in Firefox
- fixed
2012-03-19 15:02:29 -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 b5f92dfa93 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-19 10:18:52 +01:00
Martin Konecny 22cc362f1c CC-3448: Cancel show shouldn't send "cancel show" msg to pypo anymore
-done
2012-03-17 23:51:58 -04:00
Martin Konecny 5a7a502d45 CC-3436: Warn the user that the stream will be interrupted when pypo is restarted
-Done
2012-03-17 15:24:19 -04:00
Martin Konecny 9be6f1bd0e CC-3464: Playout forward cache should be configurable
-Done
2012-03-17 14:53:15 -04:00
Daniel 7914b30233 CC-3429: Firefox does not natively support mp3 file playing so preview does nothing.
- after reading about the trick foudn in Mark Panaghiston's posting from this link https://groups.google.com/forum/#!topic/jplayer/gTJrSCjwftw
- the current imperfect solution for firefox sould be to show a video jplayer that can play all the audio types.
2012-03-16 18:03:35 -04:00
Daniel 77e1c1c0cb CC-3466: Select statement for Now Playing has 'AND' in statement when no shows scheduled.
-added check to make the code do nothing when a previous, current and next show id aren't specified.
2012-03-16 17:13:32 -04:00
Daniel 8a34023336 CC-3465: Now playing should show tracks over shows for previous and next
- added logic to include previous and next show in schedule query so the now playing bar will show the tracks from the show instead of the show itself.
2012-03-16 14:02:53 -04: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
James 5156f8067e CC-3452: Live Stream: DJs assigned to the show and Program Managers should be
able to control switches and able to kick out connection

- refactoring code
2012-03-15 20:52:22 -04: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 559acfd5a1 CC-3452: Live Stream: DJs assigned to the show and Program Managers should be
able to control switches and able to kick out connection

- refactoring code
2012-03-15 14:33:59 -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