Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,831 Commits 3 Branches 0 Tags 405 MiB
Commit Graph

1523 Commits

Author SHA1 Message Date
Naomi Aro 2956009f42 CC-3451 : Ability to delete the currently playing clip 2012-03-27 14:11:36 +02:00
Naomi Aro 10e4ae781f CC-3451 : Ability to delete the currently playing clip 2012-03-27 12:44:48 +02:00
Martin Konecny 712371bde4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-26 19:02:05 -04:00
Martin Konecny 3f713ca8dc CC-3426: apache log errors from plupload 
-fixed
 2012-03-26 19:00:40 -04:00
James 0bdfa74566 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-26 18:39:24 -04:00
James 7e92b96a67 CC-3507: Live Stream status: naming 
- fixed css width
 2012-03-26 18:39:10 -04:00
Martin Konecny a50b1ffe73 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-26 17:59:53 -04:00
Martin Konecny d7af91f306 CC-3520: Change default password of monit 
-done
 2012-03-26 17:59:44 -04:00
James 44e8e96cc8 CC-3507: Live Stream status: naming 
- fixed
 2012-03-26 17:29:09 -04:00
James 191d0f0e4d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-26 17:21:30 -04:00
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
Martin Konecny 3308cbb7de Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-26 16:18:43 -04:00
Martin Konecny ccfa954f0e CC-3174: Show Content Builder 
-fixed indentation
 2012-03-26 15:43:29 -04:00
James 375be99fbd Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-26 15:09:56 -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
Martin Konecny 1a4e6c563b cc-3476: dynamic timeout 2012-03-26 14:33:33 -04:00
Martin Konecny c301cd5256 cc-3476: dynamic timeout 2012-03-26 14:33:33 -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 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
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 2beadc9301 CC-3174 : showbuilder 2012-03-15 14:14:02 +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 06e810c35d CC-3437: Live Stream: Liquidsoap(Pypo) should preserve the last switch 
status when it restarts

- missed one file from previous commit
 2012-03-14 14:43:10 -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 540f262a77 CC-3224: "On-the-fly" stream rebroadcasting 
- removed "Allow override" checkbox from show live stream section.
- removed "auto enable live stream" checkbox from stream setting page.
- implemented authentication functionality of live dj source connection.
 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 d4a387e113 - adding switch to liquidsoap 2012-03-14 14:41:00 -04:00
James dfe87723f0 - bug fix in stream setting 
- testing lisquidsoap
 2012-03-14 14:41:00 -04:00
James 128a497059 CC-3224: "On-the-fly" stream rebroadcasting 
- frond-end implementation for master dj and live dj
- db implementation
- liquidsoap is broken on this commit
 2012-03-14 14:41:00 -04:00
James 1ebe3d1812 CC-3224: "On-the-fly" stream rebroadcasting 
- Live source is created when only both port and mount point are specified
 2012-03-14 14:41:00 -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
James ca04a7a686 CC-3224: "On-the-fly" stream rebroadcasting 
- Form in preference section
 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 59e0436597 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-14 17:51:00 +01:00
Naomi Aro eb389d99d2 CC-3434 : Playlist Builder fast deleting 2012-03-14 17:50:48 +01:00
Daniel f399c7adab CC-3426: apache log errors from plupload 
- Updated code so the errors in the log are fixed.
- Performed sanity test on large file size that exceed disk space
  and normal uploads that are small enough to be copied
 2012-03-14 11:14:22 -04:00
Daniel a65ea6d058 CC-3404: Change "Now Playing" dashboard SQL query to take advantage of the "playout_status" field in the schedule table 
- updated the code to remove the empty declaration of $results
- updated parameters so the name has p_ prepended to it
- fixed a weird bug where $con was not sent to updateScheduleStatus
- modified previous element logic so I only store the index and after the loop test if it was set and then do the formating.
 2012-03-13 17:46:13 -04: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 dff0265e55 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-13 16:41:19 +01:00
Naomi Aro 7e7820d366 CC-733 : broadcast logs 
adding table scroll height.
 2012-03-13 16:41:06 +01:00
Daniel 48c8607d17 CC-3423: nowPlaying getCurrentPlaylist doesn't work for next song 
-added brackets around other if condition
 2012-03-13 11:34:43 -04:00
Daniel 13e3197ebf CC-3423: nowPlaying getCurrentPlaylist doesn't work for next song 
- added brackets to an statement
 2012-03-13 11:31:24 -04:00
Daniel 9e850838ca CC-3404: Change "Now Playing" dashboard SQL query to take advantage of the "playout_status" field in the schedule table 
- Updated ApiController to use Schedule's GetPlayOrderRange which has better performance.
 2012-03-13 10:36:11 -04:00
Daniel 1e4d34447a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 
Conflicts:
	airtime_mvc/application/models/Schedule.php
 2012-03-13 10:23:44 -04:00
Daniel cbaeda1d6b CC-3404: Change "Now Playing" dashboard SQL query to take advantage of the "playout_status" field in the schedule table 
- Updated the logic in GetPlayOrderRange now I get the previous, current and next shows and tracks to be played.
- This information is then sent back to the caller.
	- if the previous track is null the previous show is sent back as an example of the algorithm.
 2012-03-13 10:21:01 -04: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 41a46b3144 CC-3174 : showbuilder 2012-03-12 15:02:34 +01: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
Martin Konecny 5f4738dc7a CC-3389: Login page says copyright is 2010-2011 rather than 2010-2012 
-fixed
 2012-03-06 11:46:42 -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
Martin Konecny c0f83a0e02 CC-3387: Error with accessing database on Now Playing view 
-fixed
 2012-03-06 00:05:06 -05:00
Martin Konecny 0dfcb77f1a CC-3386: array access for "media_played" flag is hardcoded to 0 
-fixed
 2012-03-05 23:53:25 -05:00
Martin Konecny 348011dbc3 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-05 19:03:23 -05:00
Martin Konecny 9715de11f5 CC-3372: Improved pypo cache delete 
-Done
 2012-03-05 19:02:46 -05: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 2de81c6027 CC-2430: Preview tracks in the library + better preview (ability to jump around in clip) 
- updated logic removed when doing a rebase with devel
 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 b8452928da CC-2430: Preview tracks in the library + better preview (ability to jump around in clip) 
- updated player ui so it matches demo code
- can play any song from the library or playlist builder, but not very usable
 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
Martin Konecny 463fc1ff08 CC-3382: Include jPlayer sources in release tarball for GPL compliance 
-Done
 2012-03-05 16:17:00 -05:00
Naomi Aro a832a40c75 CC-3174 : showbuilder 
making the library a separate scrollable from playlist
 2012-03-05 18:14:10 +01:00
Daniel 228a9787a8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-05 10:59:43 -05: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
Paul Baranowski d250e2a297 CC-3380 Better names for items in the System menu 2012-03-02 17:50:52 -05:00
Martin Konecny df22ab21a6 CC-3359: Now Playing -> Day view has a bug with supporting UTC time 
-fixed
 2012-03-02 16:32:16 -05: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 98d50ae4a7 CC-3174 : showbuilder 
different width added for dialog builder.
 2012-03-02 15:47:50 +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 6c749075ac CC-3369 : Ability to identify tracks that are actually inside a show in the schedule table 
chaning column name to playout_status
 2012-03-02 12:22:08 +01:00
Martin Konecny d03d01bce9 CC-3366: Pypo: Use local files instead of downloading them 
-done
 2012-03-01 18:00:46 -05:00
Martin Konecny 508c623850 -remove comments that should not have been committed 2012-03-01 18:00:46 -05:00
Daniel f8e7d6eae3 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-01 15:35:21 -05:00
Martin Konecny 323aec218f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-01 12:16:04 -05:00
Martin Konecny d9967b9a77 -function incorrectly capitalized 2012-03-01 12:15:58 -05:00
Naomi Aro b68204751e CC-3174 : showbuilder 
making sure recorded shows aren't editable.
 2012-03-01 17:49:11 +01:00
Naomi Aro b813ba1035 CC-3174 : showbuilder 
making a time filled formatter to take the code out of show builder.
 2012-03-01 17:25:37 +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 0f9800a6bd CC-3369 : Ability to identify tracks that are actually inside a show in the schedule table 2012-03-01 14:59:06 +01:00
Naomi Aro f8608f3511 CC-3174 : showbuilder 
percent calculation for shows was off.
 2012-03-01 12:13:21 +01:00
Naomi Aro b7e5bfe4aa CC-3174 : showbuilder 
changing cues/cliplengths to be interval column type.
 2012-03-01 11:48:57 +01:00
Martin Konecny 92f19139b9 CC-3336: Refactor schedule API used by pypo 
-done
 2012-02-29 21:27:42 -05:00
Naomi Aro 99b490129c CC-3174 : showbuilder 
making a dialog on the calendar page.
 2012-03-01 00:19:59 +01:00
Daniel 8b540017a5 Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x 2012-02-29 14:55:30 -05:00
Daniel 1deee3cb65 CC-3365: Airtime API returns a non-null value for next item when there is no next item. 
- Improved check for determining if there is another element in the result set which is used to compute the next value.
 2012-02-29 14:54:54 -05:00
Naomi Aro 872bd27847 CC-3174 : showbuilder 
getting rid of useless views.
 2012-02-29 18:06:53 +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 a9e7a70dfb CC-3174 : showbuilder 
fix audio preview.
 2012-02-29 16:23:41 +01:00
Naomi Aro 7c74023ef0 CC-3174 : showbuilder 
removing ugly dsahed border, keeping height for the library dragging helper.
 2012-02-29 16:09:39 +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
Martin Konecny a6413f2d1a CC-3336: Refactor schedule API used by pypo 2012-02-28 22:33:19 -05:00
Martin Konecny 057e377c5f Merge branch 'cc-3336-refactor-pypo' into devel 2012-02-28 19:49:48 -05:00
Martin Konecny 497715df44 Merge branch 'cc-3336-refactor-pypo' of dev.sourcefabric.org:airtime into cc-3336-refactor-pypo 
Conflicts:
	airtime_mvc/application/models/Schedule.php
	python_apps/pypo/pypofetch.py
	python_apps/pypo/pypopush.py
 2012-02-28 19:22:13 -05: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
Martin Konecny b572b26b68 CC-3336: Refactor schedule API used by pypo 
-make sure that empty arrays are objects and not arrays
-clean up some comments
 2012-02-28 15:32:18 -05:00
Martin Konecny 11f31effca CC-3336: Refactor schedule API used by pypo 2012-02-28 15:04:24 -05:00
Naomi Aro 4386690b54 CC-3174 : showbuilder 
prevents scheduling outside a show.
 2012-02-28 20:58:06 +01:00
Martin Konecny a53d856e8d CC-3336: Refactor schedule API used by pypo 
-add comment
 2012-02-28 14:56:21 -05:00
Martin Konecny 99c24ed038 CC-3336: Refactor schedule API used by pypo 
-removed export_source
-rewrote GetScheduledPlaylists()
 2012-02-28 14:52:44 -05:00
Martin Konecny 322d1bfa99 CC-3336: Refactor schedule API used by pypo 
-initial commit
 2012-02-28 14:43:39 -05:00
Martin Konecny 413d669bbf Merge branch 'cc-3336-refactor-pypo' of dev.sourcefabric.org:airtime into cc-3336-refactor-pypo 
Conflicts:
	airtime_mvc/application/models/Schedule.php
	python_apps/pypo/pypofetch.py
	python_apps/pypo/pypopush.py

-weird conflict. I must have committed while I had my changes git-stash'ed
 2012-02-28 13:58:10 -05:00
Daniel 15552319aa CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI 
- updated formating of file, removed tabs in favour of four spaces for some lines.
 2012-02-28 13:47:57 -05:00