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

560 Commits

Author SHA1 Message Date
Martin Konecny 5a8df0321e CC-3548: Schedule: Separate repeate show template and single instance on 'When' section 
-in progress
 2012-04-12 11:54:51 -04:00
James 18391604b5 CC-3424: UI Design for new drop down menu 
- html integration
 2012-04-12 10:26:11 -04:00
James 0ec58f0bc3 CC-3250: UI design for mount monitor for media monitor 
( Manage Media Folder and Playlist Builder screen)

- adding tooltip and fixed a minor bug
 2012-04-11 17:24:26 -04:00
Martin Konecny bdd3444acf CC-3548: Schedule: Separate repeate show template and single instance on 'When' section 
-in progress
 2012-04-11 16:45:03 -04:00
James 148fdfb8f9 Merge branch 'CC-3603' into devel 2012-04-10 15:28:38 -04:00
Naomi Aro b998a04c2e Merge branch 'devel' into CC-3174 2012-04-10 15:57:13 +02:00
James 32548de639 CC-3486: Text Fields in Stream settings behave in unorthodox way. Highlighting 
entire text and typing does not erase the highlighted text.

- removed all the masking
- meioMask is very outdated so it's removed from the project.
 2012-04-09 16:35:39 -04:00
Denise Rigato 7fc575e750 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-09 15:51:37 -04:00
Denise Rigato ee0a08be15 CC-3487: Improved restart warning message for stream settings page 
-fixed
 2012-04-09 15:51:17 -04:00
Martin Konecny 5bc1fe84ad Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-09 12:43:46 -04:00
Martin Konecny 54ec6445c6 CC-3606: System->Media Folders-> system seems to search 
-fixed. Need to check if directory actually exists.
 2012-04-09 12:43:40 -04:00
James b32e463350 CC-3590: Calendar GUI->DJ user should not be able to invoke "Add Show" window 
- fixed
 2012-04-09 12:19:22 -04:00
James 064490a2fd CC-3603: Calendar->Once you update the rebroadcasted show it disappears 
- temp commit
 2012-04-09 10:37:44 -04:00
Martin Konecny d562a26f4b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-07 22:33:47 -04:00
Martin Konecny 548c4ffb8d -change it so that user can access API actions if logged in. 2012-04-07 22:28:10 -04:00
James 954fa2bceb CC-3444: Ability to edit currently playing show (end time and permissions) 
- handling in better way. we created separate action for this.
 2012-04-05 16:01:27 -04:00
Martin Konecny ef6c496ba3 CC-3541: Missing show title from "Show Content" pop-up 
-fixed
 2012-04-05 15:49:58 -04:00
Martin Konecny 8050a1ce29 CC-3548: Schedule: Separate repeate show template and single instance on 'When' section 
-in progress
 2012-04-05 14:45:16 -04:00
Naomi Aro 0b3809c379 CC-3110 : Password reset 
added sender email to preferences form, created db upgrade script.
 2012-04-05 14:18:42 +02:00
Naomi Aro 35d2ded26b CC-3597 : Playlist->Library->Edit Metadata: Throw exception after click "Cancel" at "Edit Metadata" page 2012-04-05 10:47:35 +02:00
James ab7da1ce90 CC-3581: Calendar->It should not be possible to change the duration for 
the recorded show

- "When" section is disabled when editting rebroadcasting show
 2012-04-04 15:44:52 -04:00
James 5da7d42290 CC-3548: Schedule: Separate repeate show template and single instance on 
'When' section

- UI portion of the feature
 2012-04-04 14:53:26 -04:00
Martin Konecny 3be1944fa4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-03 18:29:44 -04:00
Martin Konecny 366ea78fce CC-3532: Now Playing GUI-> Progress bar is still playing after end of show 
-fixed
 2012-04-03 18:29:36 -04:00
James bcdd27863f CC-3513: Playlist Builder->Download makes user be redirected to a blank page 
- fixed
 2012-04-03 16:30:54 -04:00
Naomi Aro 6c25423f4e CC-3545 : Calendar->AddRemove (Now Playing Tab->Add Files to Show) -> changing order of tracks is not correct 
removing table tools.
replacing with something simpler that will preserve order on screen.
 2012-04-02 19:03:11 +02:00
Naomi Aro eeb7273909 CC-3542 : When you delete the current show it takes all songs from that show out of the playout history 2012-04-02 15:20:13 +02:00
Naomi Aro ebf530a97c CC-3558 : Playlist->EditMetadata->Save Changes -> 404 page not found page appears 2012-04-02 11:02:03 +02:00
James 286c240012 CC-3444: Ability to edit currently playing show (end time and permissions) 
- done
 2012-03-30 15:11:24 -04:00
Naomi Aro cea37774ca CC-3551 : Change Cue Out for currently deleted track 2012-03-29 19:20:02 +02:00
Naomi Aro 5a24331ef6 CC-3547 : Refactoring Views, removing action stack to better work with permissions. Reorganizing Statistics Dialog. 2012-03-29 17:37:18 +02:00
Naomi Aro 12b23443db CC-3547 : Refactoring Views, removing action stack to better work with permissions. Reorganizing Statistics Dialog. 2012-03-29 16:27:08 +02:00
Naomi Aro f48c5ff575 CC-3547 : Refactoring Views, removing action stack to better work with permissions. Reorganizing Statistics Dialog. 2012-03-29 15:34:58 +02:00
Naomi Aro d12ef1c7a2 CC-3536 : Work out ACL with library on NowPlaying when it's a guest User 2012-03-28 18:43:44 +02:00
Naomi Aro aca6e995dd CC-3503 : Preserve the state of "Now Playing" screen - whether Library section is open or not 2012-03-28 17:29:34 +02:00
Naomi Aro fe21abf16d CC-3503 : Preserve the state of "Now Playing" screen - whether Library section is open or not 2012-03-28 16:14:02 +02:00
Naomi Aro 4904a16ebb CC-3534 : Check Scheduling Edge Cases 
extracting out error checking in scheduling, added created column to cc_showinstances
 2012-03-28 14:23:25 +02:00
Naomi Aro 9dbe8a5e5e CC-3463 : Usability improvements for timeline 2012-03-27 18:40:17 +02:00
Naomi Aro c1bdc6ff0f CC-3463 : Usability improvements for timeline 
working on timeline context menu.
cursor/play functions.
 2012-03-27 18:27:58 +02:00
Naomi Aro 9c52b2ee1f CC-3174 : showbuilder 
fixing jplayer preview
 2012-03-27 16:27:43 +02:00
Naomi Aro dfc6ae6273 CC-3463 : Usability improvements for timeline 
started to add cursor options to context menu.
 2012-03-27 15:46:25 +02:00
Naomi Aro 451b573c52 Merge branch 'CC-3174' into devel 2012-03-27 14:14:58 +02:00
Naomi Aro 10e4ae781f CC-3451 : Ability to delete the currently playing clip 2012-03-27 12:44:48 +02:00
Martin Konecny 3f713ca8dc CC-3426: apache log errors from plupload 
-fixed
 2012-03-26 19:00:40 -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 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
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
James e194ff0dc8 CC-3469: Stream settings: Connection URLs are not generated correctly 
- done
 2012-03-19 16:08:23 -04: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
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
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 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 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
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 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 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 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
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 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
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
Naomi Aro 6830af574a CC-3174 : showbuilder 
fixing some merge stuff.
 2012-03-13 12:52:41 +01: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
Naomi Aro f28f6659dc CC-3403 : Replace Now Playing with the new Timeline screen 2012-03-12 14:23: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 53b8eb2724 CC-733 : export broadcast logs 
exporting stats based on czech law
 2012-03-08 18:30:56 +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 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 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 dd3b7afff2 Updated library so I can play a song. 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
Paul Baranowski d250e2a297 CC-3380 Better names for items in the System menu 2012-03-02 17:50:52 -05:00