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

789 Commits

Author SHA1 Message Date
denise d8a75cf5c6 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-06 17:06:54 -04:00
denise fda04295a6 CC-3941: Overridden connection url in stream settings gets reverted back to default when 'Save' is clicked 
-fixed
 2012-06-06 17:06:46 -04:00
James fb533bed07 CC-3855: System -> Support Feedback: Cannot uncheck 'Promote my station 
on Sourcefabric.org' if it's checked then saved.

- fixed
 2012-06-06 14:26:23 -04:00
James 0ca45e343b CC-3878: Recorded media file's track number is changed after restarting media-monitor 
- fixed
 2012-06-06 14:18:54 -04:00
James b23e3d0a54 CC-3927: Should automatically switch back to Master/Show stream if there is a 
connection interruption

- done
 2012-06-05 16:41:41 -04:00
denise 990dea12a4 CC-3895: Sometimes Media Monitor will not update the length of tracks with the same title but different contents. 
-fixed
 2012-06-05 11:20:00 -04:00
denise c1976162cb CC-3793: "Star time" check will block updating shows when error found in colour settings 
-fixed
 2012-06-05 11:19:59 -04:00
denise f23582612a SAAS-247: Stream settings wipes out master/show source settings if is a SAAS instance 
-fixed
 2012-05-28 15:41:59 -04:00
Naomi Aro d91850b1ca CC-3877 : Now Playing-> Show manipulation buttons should be disabled for guest user and DJ's who are not assigned to the show 2012-05-24 18:10:36 +02:00
Naomi Aro 428b13f3d7 CC-3803 : Don't allow editing of a current Record show 2012-05-22 17:51:53 +02:00
Naomi Aro 95003c3571 CC-3712 : Trial end date overlaps with Airtime Clock 2012-05-22 12:45:42 +02:00
Martin Konecny f485b9b601 CC-3804: The title of the record show's media will be changed after Media Monitor restart 
-removed re-setting the track_title. It was causing problems, and it seems to no
longer have a reason to be here (you cannot rename a recorded show after it
has started)
 2012-05-21 02:23:34 -04:00
Naomi Aro 466e30895c CC-3845 : General UI cleanup 2012-05-18 16:00:36 +02:00
Naomi Aro ff1327881a CC-3845 : General UI cleanup 2012-05-18 15:40:22 +02:00
Naomi Aro 5d3382a3d9 CC-3845 : General UI cleanup 
changing eye icon to play for the preview option in a context menu.
 2012-05-18 12:29:37 +02:00
Naomi Aro ccbe4f1998 CC-3420 : Custom UI for jplayer from CC-3395 
creating new stylesheet for our audio previews based from jplayer blue monday.
 2012-05-17 16:20:40 +02:00
Martin Konecny 025ef0ed27 CC-3826: Couldn't find constant MDATA_KEY_RECORD_DATE 
-fixed
 2012-05-15 12:35:02 -04:00
Naomi Aro 803c44611a CC-3819 : Add View on Soundcloud context menu option on calendar page 2012-05-14 15:48:09 +02:00
Naomi Aro f8900d4b05 CC-3817 : Should use soundcloud icon for recorded & uploaded shows in timeline for past shows to match calendar 2012-05-14 15:13:08 +02:00
Naomi Aro cc71c61fce CC-3816 : Automatic uploading of recorded shows, View on Soundcloud choice in menu doesn't work 2012-05-14 13:01:44 +02:00
Naomi Aro 97ce006130 CC-3816 : Automatic uploading of recorded shows, View on Soundcloud choice in menu doesn't work 2012-05-14 12:36:57 +02:00
denise de3e5a6e3c SAAS-223: Airtime Usage Metric: Amount of time spent broadcasting 
-fixed inserts into cc_live_log
 2012-05-11 16:09:36 -04:00
denise 99738fad30 SAAS-223: Airtime Usage Metric: Amount of time spent broadcasting 
-added cc_live_log inserts
 2012-05-11 16:09:35 -04:00
denise e347819c77 SAAS-223: Airtime Usage Metric: Amount of time spent broadcasting 
-created cc_live_log table
 2012-05-11 16:06:28 -04:00
Naomi Aro df4cdfb07e CC-3687 : Remove context menus from recorded shows since they are blank. 2012-05-07 17:48:56 +02:00
Naomi Aro edaec54a5d CC-3724 : Now Playing -> Timeline view: to drag and drop single file very fast will block adding the same file 
using jquery.blockUI.js on timeline/playlist builder pages.
 2012-05-04 15:00:18 +02:00
denise 81d7e0c80f CC-3747: Metadata popup should also show the filepath of the track 
-fixed filepath join
 2012-05-03 09:59:31 -04:00
denise ff6e2a2e5a CC-3747: Metadata popup should also show the filepath of the track 
-fixed
 2012-05-02 16:52:49 -04:00
James 8a2b9e7221 CC-3746: Calendar: Duration of 24hrs show is 00h 00m 
- fixed
 2012-05-01 17:05:18 -04:00
James 0fe4478bb5 CC-3478: Calendar->Show has some inconsistencies on special Days (e.g. 
switching to Daylight Saving Time)

- added exception handling
 2012-04-26 10:56:08 -04:00
Naomi Aro 2c84420424 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-26 12:15:31 +02:00
Naomi Aro b5863d3d7a CC-3522 : Now Playing Screen-> Periodical message pops up 2012-04-26 12:14:41 +02:00
James 28d27b8932 CC-3719: "Start time" check will block editing ON AIR show 
- fixed
 2012-04-25 18:01:37 -04:00
James b5a65ae7e4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-25 17:22:05 -04:00
James fe71487fa2 CC-3478: Calendar->Show has some inconsistencies on special Days (e.g. 
switching to Daylight Saving Time)

- fixed
 2012-04-25 17:21:25 -04:00
Martin Konecny e12bd35ee2 CC-3671: add show on week/day view doesn't get start time/end time filled in 
-use str formatter for padding
 2012-04-25 16:39:58 -04:00
Naomi Aro b6bed6ce7a CC-3667 : Preferences pages should have an option to enable/disable password recovery option 2012-04-25 15:22:38 +02:00
Martin Konecny 63a5f45e9b CC-3690: Able to create repeat show in the past, by editing an already ON AIR show 
-fixed
 2012-04-24 18:22:39 -04:00
James 3c4d01aa93 CC-3675: Playlist -> the files from Disconnected Mediafolder can still 
be previewed (played)

- done
 2012-04-24 12:59:07 -04:00
Martin Konecny b9ab11ce28 CC-3702: System -> Status: No difference between a service is failed vs a service is not monitor 
-fixed
 2012-04-23 17:18:34 -04:00
Martin Konecny 6e9b179afc CC-3603: Calendar->Once you update the rebroadcasted show it disappears 
-fixed
 2012-04-20 16:57:32 -04:00
Naomi Aro d5a416be43 CC-3416 : Create password reset form 2012-04-20 16:10:27 +02:00
Naomi Aro e242972a78 Merge branch 'CC-3174' into devel 2012-04-20 13:04:38 +02:00
Naomi Aro 6b4fd7d3bb CC-3686 : Improve differentiation of a record/rebroadcast show in the timeline 2012-04-20 13:03:50 +02:00
paul.baranowski 96b010e7f0 CC-1927 Remove PEAR DB 
* Removed all traces of PEAR functions.
* Fixed AirtimeInstall::GetVersionInstalled() to return the correct answer
  even when it cant connect to the database.  Also fixed return value to
  be consistent on failure.
* Fixed phone_home_stat.php and soundcloud-uploader.php
 2012-04-19 16:35:19 -04:00
paul.baranowski 7f78a7f663 CC-1927: Remove PEAR DB 
First pass through the model classes to remove use of $CC_DBC.
Web application is working.
There are still other parts of the app that use PEAR DB.
 2012-04-19 16:33:05 -04:00
paul.baranowski f69a172ee1 Commented out a bunch of Logging debug lines. There was a lot of output 
being logged in the Zend log file.
 2012-04-19 16:16:56 -04:00
Martin Konecny 92f2027fc4 -missing CC_CONFIG global.. 2012-04-19 15:06:15 -04:00
Martin Konecny 1e111f176e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-19 15:03:28 -04:00
Martin Konecny 458aae33a1 CC-3429: Firefox does not natively support mp3 file playing so preview does nothing. 
-Removed use of filemtime
-audiopreview is now in correct directory
 2012-04-19 15:03:17 -04:00
James ee7829d920 CC-3663: Cannot edit rebroadcast show 
-fixed
 2012-04-19 12:57:13 -04:00
James a7fc31012f CC-3689: Remove Edit Show Instance ability 
- done
 2012-04-19 11:29:19 -04:00
Martin Konecny 5bea867bec CC-3429: Firefox does not natively support mp3 file playing so preview does nothing. 
-fixed
 2012-04-18 19:02:29 -04:00
Martin Konecny 70a51f1aca Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-18 15:45:15 -04:00
James dacdc4e432 CC-3672: Source switch stays connected if current show is cancelled 
- fixed
 2012-04-18 15:38:47 -04:00
denise 479e112317 CC-3637: Now playing shows "Nothing Scheduled" when restreaming external source 
-fixed
 2012-04-18 12:30:37 -04:00
Martin Konecny 64a7a13f79 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-17 16:25:57 -04:00
Martin Konecny d258e39b2e CC-3456: PlaylistBuilder -> does not identify NetworkDrive outage. 
-Remove unecessary "continue;" statements
 2012-04-17 16:25:10 -04:00
James 5df1fede9f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-17 15:43:39 -04:00
James a91785ff42 CC-3652: Can't edit current show if it's a single instance 
when the timezone is in CEST(prague timezone)

- The bug was that it was using local timestamp for the current time.
- removed some unnecessary code
- changed a variable name to more understandable name.
 2012-04-17 15:43:18 -04:00
Martin Konecny 29e24d1847 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-17 12:24:05 -04:00
Martin Konecny cdf92b016f CC-3655: Context menu for current show missing add/remove content and remove all content options. 
-undone
 2012-04-17 12:23:56 -04:00
Naomi Aro 102bcb1d46 CC-3416 : Create password reset form 2012-04-17 18:16:10 +02:00
James 4527da6cdf Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-16 18:22:03 -04:00
James 1d91d1b11b CC-3659: Override on Master/Show Source connection needs to have 
better description about what the override field actually does.

- fixed description
- extra fix:
 - using variable instead of hard coded text
 - removed unnecessary code
 2012-04-16 18:21:28 -04:00
denise 27e5a6db5e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-16 17:36:19 -04:00
denise e786514f27 CC-3655: Context menu for current show missing add/remove content and remove all content options. 
-fixed
 2012-04-16 17:31:16 -04:00
James c08800468f CC-3658: DJ assigned to the Show can't switch/kick streams 
- fixed
 2012-04-16 17:29:02 -04:00
James 2f4861db26 CC-3444: Ability to edit currently playing show (end time and permissions) 
- added comment
 2012-04-16 17:06:06 -04:00
James d11fca8ac8 CC-3444: Ability to edit currently playing show (end time and permissions 
- fixed
 2012-04-16 16:48:04 -04:00
James 2e811dfef8 CC-3642: System->Streams->DJ URL changes are not reflected in Calendar 
->LiveStream

- fixed
 2012-04-16 15:23:37 -04:00
Naomi Aro a0fb607d30 Merge branch 'CC-3174' into devel 2012-04-16 16:40:02 +02:00
Naomi Aro c96c60dc5a CC-3620 : Calendar -> Unresponsive script warning when trying to add 300 ogg files 
improving speed of js rendering,
datatables config is loaded from localstorage,
removed aggregate propel behaviour on cc_show_instances time_filled.
 2012-04-16 16:33:32 +02:00
James ffc17ba705 CC-3636: Media Folder: dir path in cc_music_dir should be in consistent format 
- DateHelper.php is moved from model to common folder
- created OsPath.php file which contains normpath()
- normpath() is used instead of realpath()
 2012-04-13 17:45:28 -04:00
James 9cafc91785 CC-3456: PlaylistBuilder -> does not identify NetworkDrive outage. Attempt to 
play unavailable track leads to platform hanging

- in cast of mount/unmoun drive has some nested folder that were already in the
cc_music_dirs table, airtime was only setting true/false flag on only one of
the entry.
 2012-04-13 17:18:31 -04:00
James f522c7a7af Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-12 16:17:36 -04:00
James 53e37ee826 CC-3634: Media Folder: if file was deleted from file system, and the file was 
scheduled in the future, it wasn't getting deleted from AIrtime

- fixed
 2012-04-12 16:17:19 -04:00
Martin Konecny 04718a88ae CC-3548: Schedule: Separate repeate show template and single instance on 'When' section 
-done
 2012-04-12 13:29:49 -04:00
Martin Konecny 8303eb728e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-12 11:54:58 -04:00
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
Martin Konecny 508c623850 -remove comments that should not have been committed 2012-03-01 18:00:46 -05: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
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 057e377c5f Merge branch 'cc-3336-refactor-pypo' into devel 2012-02-28 19:49:48 -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 322d1bfa99 CC-3336: Refactor schedule API used by pypo 
-initial commit
 2012-02-28 14:43:39 -05:00
Naomi Aro 564575d657 CC-3174 : showbuilder 
fixing timezone calculations if browser/server is different.
 2012-02-27 20:14:12 +01:00
Naomi Aro 8ae303de83 CC-3174 : showbuilder 
need up to date version of datatables.
 2012-02-27 12:42:04 +01:00
Naomi Aro 3cc1506086 CC-3358 : Metadata Qtip 2012-02-27 12:23:22 +01:00
James 446233fbd4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-02-24 14:15:06 -05:00
James 2f689ed583 CC-3346: Recorder: Merge recorder with pypo 
- Pypo fech works as msg listner for recroder now.
- recorder is part of pypo and all it does is waiting for msg from pypo
fetch and spwan a show recorder thread.
- added new parameter logger to api client. This way apiclient will log
into specific log file instead of grabbing current log file.
- show recoder is removed from all check system/status page
 2012-02-24 14:11:35 -05:00
Naomi Aro 19d13889af CC-3351 : Track length should only show to tenths of a second in the library 
created a length formatter to use in multiple places.
 2012-02-24 15:07:04 +01:00
Naomi Aro d93041edb9 CC-3174 : showbuilder 
change default value to prevent apache error logs.
 2012-02-23 18:06:08 +01:00
Naomi Aro 753c05ce5b CC-3335 : Timeline: Drag and drop usability improvements 
cursor must be used to add tracks to timeline, not check boxes.
 2012-02-23 17:46:07 +01:00
Naomi Aro b357b80054 CC-3174 : showbuilder 
created controller Usersettings, noticed hosts couldn't
save datatables setting through pref controller.

starting to use new cursor arrows.
 2012-02-23 12:13:00 +01:00
Naomi Aro aabcaafff0 CC-3174 : showbuilder 
nowplaying uses current datatables.
 2012-02-23 11:10:49 +01:00
Naomi Aro 4bc51cbad1 CC-3174 : showbuilder 
forgotten unused var.
 2012-02-23 11:01:52 +01:00
Naomi Aro a1e8903a64 CC-3174 : showbuilder 
fixing some errors found in apache log.
 2012-02-22 22:25:14 +01:00
Naomi Aro d4c7b832c9 CC-3174 : showbuilder 
fixing up library table to include all interesting columns if a user would like to choose to see them.
query is done with propel.
 2012-02-22 18:38:33 +01:00
Naomi Aro 0ba3049528 CC-3174 : showbuilder 
removing old scheduling method code to avoid confusion.
 2012-02-22 13:19:49 +01:00
Naomi Aro 2aae318a5a CC-3174 : showbuilder 
remembering state for the timeline datatable.
 2012-02-22 12:42:24 +01:00
Naomi Aro 5703508beb CC-3174 : showbuilder 
col reorder resize isn't new enough to work with the new save/load callbacks.
switched to just the col reorder plugin written by Allan( datatables author)
 2012-02-22 11:43:37 +01:00
Naomi Aro 5f89975c64 CC-3174 : showbuilder 
datatables state restore needs real booleans not strings.
 2012-02-22 00:02:35 +01:00
Naomi Aro 9b5a0fc565 CC-3174 : showbuilder 
working on trying to save/load state serialized into the db for datatables.
 2012-02-21 17:31:54 +01:00
Naomi Aro c0f16fac3c CC-3174 : showbuilder 
improving playlist functionality/error checking like the showbuilder.
will send last modified ts to make sure user has a current copy of the open playlist.
 2012-02-20 18:24:04 +01:00
Naomi Aro 09ae26a531 CC-3174 : showbuilder 
fixing bug moving item to beginning of show
 2012-02-17 12:19:42 +01:00
Naomi Aro ac11d8bcf6 Merge branch 'CC-3174' into devel 
Conflicts:
	airtime_mvc/application/models/StoredFile.php
 2012-02-17 11:50:49 +01:00
Naomi Aro e1d5d6de73 CC-3174 : showbuilder 
checking modification time before deleting items.
Throws a ScheduleOutdatedException
 2012-02-16 16:29:11 +01:00
Naomi Aro f14ebce239 CC-3174 : showbuilder 
adding new column last_scheduled to cc_show_instance
changing column time_filled to be of type interval.
 2012-02-15 18:27:59 +01:00
Naomi Aro b1fbeeb448 CC-3174 : showbuilder 
adding a showbuilder form, can filter by show,
or if you're a host user by all shows you can schedule in a range.
 2012-02-15 00:39:27 +01:00
Daniel 14a9225b97 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-02-14 18:12:51 -05:00
Daniel 14cd9ed0e9 CC-323: Show appropriate error message if disk is full when attempting to upload files via the web UI 
- Updated the StoreFile logic so it won't die while trying to copy a file, and instead pass error messages to the controller which can decide if it wants to die, which 	I've set ApiController and PluploadController todo on receipt of error code.
 2012-02-14 18:12:29 -05:00
Martin Konecny 54cbc86a0a Merge branch '2.0.x' into devel 
Conflicts:
	VERSION
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/models/Nowplaying.php
	airtime_mvc/application/models/Show.php
	airtime_mvc/application/models/airtime/CcShowInstances.php
 2012-02-14 14:47:07 -05:00
Martin Konecny eadf68cb61 CC-3318: When changing stream settings (Liquidsoap + Pypo restart), sometimes Airtime does not resume playback 
-fixed
 2012-02-10 18:43:40 -05:00
Martin Konecny babfa1830c CC-3317: PHP Undefined variable error in SystemstatusController 
-fixed
 2012-02-10 13:12:18 -05:00
Naomi Aro 941da1fe44 CC-3174 : showbuilder 
adding add/remove to the context menu.
airtimeline now has default set start/end times in the inputs.
 2012-02-09 23:41:12 +01:00
Naomi Aro fdd962f5ce CC-3174 : showbuilder 
replacing context menus on calendar screen.
 2012-02-09 21:19:21 +01:00
Daniel a4a41f301f Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x 2012-02-09 15:05:36 -05:00
Daniel b603726a39 CC-3289: Widgets should have a version string so users can make sure widgets are up to date 
-I've updated the messages used to notify the user to be more explicit.
-I've moved the constant used to track widget api versioning to /application/configs/constants.php
 2012-02-09 15:04:52 -05:00
Naomi Aro 4691799326 Merge branch 'devel' into CC-3174 
Conflicts:
	airtime_mvc/application/controllers/ScheduleController.php
 2012-02-09 19:41:31 +01:00
James 33fcbddcb9 CC-3284: Don't make browser users clear their cache when Airtime is upgraded 
- use airtime version string instead of filemtime function

Conflicts:

	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/controllers/ScheduleController.php
 2012-02-08 16:21:57 -05:00
James ba3cc45d36 CC-3284: Don't make browser users clear their cache when Airtime is upgraded 
- use airtime version string instead of filemtime function
 2012-02-08 15:57:42 -05:00
Daniel 5d31e4c2a0 CC-3289: Widgets should have a version string so users can make sure widgets are up to date 
- I updated the ApiController.php file to add a widgetsVersion value used in the response to widgets
- I updated the widgets jquery.showinfo.js file to check the version and report back to the user.
 2012-02-08 14:57:48 -05:00
Naomi Aro a2f38b94a2 CC-3174 : showbuilder 
changing show context menus
 2012-02-08 13:12:08 +01:00
Naomi Aro 581f86a1de CC-3174 : showbuilder 
show editing menu added.
 2012-02-08 12:53:46 +01:00
Naomi Aro 216ce80ceb CC-3174 : showbuilder 
have to replace context menus on calendar page.
 2012-02-08 11:16:23 +01:00
Naomi Aro 3728ffaddc CC-3174 : showbuilder 
upgraded full calendar to 1.5.3 so that it works with jquery 1.7.1

need to replace context menu on the page, old one doesn't work anymore anyways.
 2012-02-07 23:58:36 +01:00
Naomi Aro 668e214371 CC-3174 : showbuilder 
unsetting playlist id in the session properly.
 2012-02-07 18:42:34 +01:00
Naomi Aro 9e08f857bf CC-3174 : showbuilder 
fixing merge with playlist tooltip
 2012-02-06 11:59:20 +01:00
Naomi Aro 776d1b65e8 CC-3174 : showbuilder 
fixing merge, testing that affected functionality still works.
 2012-02-06 11:23:10 +01:00
Naomi Aro 42452b8ea9 Merge branch 'CC-3174' into devel 
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/controllers/PlaylistController.php
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/models/Playlist.php
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/public/js/airtime/library/spl.js
 2012-02-06 11:07:10 +01:00
Naomi Aro 16863ee95e CC-3174 : showbuilder/library 
playlist fades are working again, still need more error checking to be done.
 2012-02-05 23:38:12 +01:00
Naomi Aro fbec92cb0d CC-3174 : showbuilder/library 
soundcloud icon stuff is back.
 2012-02-05 19:48:23 +01:00
Naomi Aro 6c2475bf1f CC-3174 : showbuilder 
mostly done with new context menu, need to finish
add/delete button actions on lib table for both screens.
 2012-02-05 18:19:22 +01:00
Naomi Aro da5e1ac302 CC-3174 : showbuilder/library 
adding new context menu, link to view on soundcloud doesn't seem to work.
 2012-02-05 13:56:07 +01:00
Naomi Aro e8f2506474 CC-3174 : showbuilder 
changing playlist table to remove unused columns, adding foreign key to user, adding aggregate length column.
 2012-02-04 21:26:21 +01:00
Naomi Aro 38f3d6bfb0 CC-3174: showbuilder/library refactoring 
adding new context menu files, playlist is working except for editing fades.
 2012-02-04 19:27:26 +01:00
Naomi Aro 46fdf56b70 CC-3174 : showbuilder 
refactoring playlist to work with group add/delete by resource id and using transactions.
 2012-02-04 15:52:31 +01:00
Daniel d6bf95500c CC-2065: Fade times longer than Airtime supports can be set in Playlist Builder and Preferences 
- didn't change much fixed two bugs and changed formating.
- I introduced a but in Playlist.changeFadeInfo because for the general playlist fade in and out I didn't realize that these values are being set to the first and last elements. So I added a guard.
- I also updated the logic for Playlist.moveAudioClip so if new and old position are the same we just return
 2012-02-03 18:19:13 -05:00
Naomi Aro 19f069b602 CC-3174 : showbuilder 
can add items to a playlist with the refactoring.
 2012-02-04 00:12:06 +01:00
Naomi Aro 0afa904ffe CC-3174 : showbuilder 
refactoring playlists for the group add/delete
 2012-02-03 18:15:10 +01:00
Naomi Aro 6da4397a96 CC-3174 : show builder 
can add playlists to the time line
upgraded datatables to 1.9
upgraded qtip2 to a newer version
put qtips on type column on lib table.
 2012-02-02 23:15:39 +01:00
Naomi Aro e001cd24c1 CC-3174 : show builder 
darg into and drag around in the timeline is now working.
need to change schedule table to not have auto incrementing ids
to preserve an item's id for REST.
(might find another way)
 2012-02-02 18:13:20 +01:00
Naomi Aro 0199f572bd CC-3174 : showbuilder 
dragging into timeline is working
need to replace jjmenus
 2012-02-02 15:51:15 +01:00
Naomi Aro 3aab811a3e CC-3174 : showbuilder 
fixing some css/js for display.
 2012-02-01 23:33:20 +01:00
Naomi Aro f5b2a23eb1 CC-3174 : showbuilder 
group add/delete is working
 2012-02-01 18:47:08 +01:00
James df73726961 CC-3293: Stream settings page does not remember the stream metadata format 
- fixed
 2012-02-01 12:10:31 -05:00
James 026bdebacc CC-3293: Stream settings page does not remember the stream metadata format 
- fixed
 2012-02-01 12:09:59 -05:00
James 4ffe79a286 CC-3290: A file should be removed from playlists if it is removed 
through the interface

- fixed
 2012-02-01 10:59:04 -05:00