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
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
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
fa1f03ed58
CC-3174 : showbuilder
...
improving look of playlist when files are not on disk.
2012-03-15 12:08:29 +01:00
Naomi Aro
3019cb9c42
CC-3434 : playlist
...
changing image to be smaller.
2012-03-15 11:37:20 +01:00
Naomi Aro
ae646545c4
CC-3201 : file import more visible
2012-03-15 11:36:32 +01:00
James
03c8c10ba1
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-14 15:26:26 -04:00
James
16c0756d76
CC-3224: "On-the-fly" stream rebroadcasting
...
- css fix
2012-03-14 15:26:07 -04: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
30901aa0d6
CC-3224: "On-the-fly" stream rebroadcasting
...
- A section where user can setup port and mount point for harbor input in
stream setting page(front-end and back-end)
- updated the part where it rewrites the liquidsoap.cfg file
2012-03-14 14:41:00 -04:00
James
48bb19d758
CC-3224: "On-the-fly" stream rebroadcasting
...
- web interface
- auth script for liquidsoap
- DB changes
2012-03-14 14:41:00 -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
309c6da83d
CC-3440 : Calendar time picker is hidden for day and week views
2012-03-14 18:05:50 +01: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
a8d61ff19c
CC-3328 : Scrolling behaviour in Chrome on OSX makes Airtime unusable
2012-03-13 14:19:25 +01:00
Naomi Aro
6830af574a
CC-3174 : showbuilder
...
fixing some merge stuff.
2012-03-13 12:52:41 +01:00
Martin Konecny
6f270bfb3d
Merge branch '2.0.x' into devel
...
Conflicts:
VERSION
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/models/Show.php
airtime_mvc/public/js/airtime/dashboard/helperfunctions.js
install_minimal/include/airtime-constants.php
python_apps/api_clients/api_client.py
python_apps/pypo/pypocli.py
python_apps/pypo/pypofetch.py
2012-03-12 17:52:17 -04:00
Martin Konecny
926231513e
-remove unused function
2012-03-12 12:24:54 -04: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