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

1946 Commits

Author SHA1 Message Date
Martin Konecny d4b1fc711e CC-3928: Use liquidsoap to test whether file is playable on upload. 
-change to wording
 2012-06-05 22:30:17 -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 4bcf904f92 CC-3932: Master/Source Source Connection URL should be in non-editable box 
-done
 2012-06-05 15:13:04 -04:00
denise 8b71ed6078 CC-3850: Use qTip instead of custom tooltips 
-removed description from cb_airtime_auth and cb_custom_auth
-description is no longer needed since we use qtips
 2012-06-05 14:49:31 -04:00
denise 5966c7feda fixed merge conflit 2012-06-05 14:47:11 -04:00
denise 35be145043 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-05 14:41:19 -04:00
denise df3a74b501 CC-3850: Use qTip instead of custom tooltips 
-removed description from icecast_vorbis_metadata element
 2012-06-05 14:40:40 -04:00
James 51227b4cad CC-3934: Master and Show stream override need to be disabled on airtime-demo 
- done
 2012-06-05 12:18:59 -04:00
denise af71a03982 CC-3925: Media Library: Please keep staying current page after editing or searching items instead of switching to first page. 
-maintains current page after edit metadata
 2012-06-05 11:27:17 -04:00
denise 74e9f70506 CC-3928: Use liquidsoap to test whether file is playable on upload. 
-done
 2012-06-05 11:24:40 -04:00
denise a3754be31a CC-3850: Use qTip instead of custom tooltips 
-done
 2012-06-05 11:24:40 -04:00
denise e3bacba39b CC-3920: Phone home stats: explain to the user the benefits to them to clicking YES 
-done
 2012-06-05 11:20:00 -04:00
denise 9c89d263db CC-3880: NowPlaying-> there is no tooltip for the removed files available 
-done
 2012-06-05 11:20:00 -04:00
denise c554190faf -fixed indentation 2012-06-05 11:20:00 -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 c18704aa4d CC-3900: Show Builder boxes remain checked even when the item is no longer visible 
-fixed playlist builder "Dragging <x> items" message so <x> is amount of visible items only
 2012-06-05 11:20:00 -04:00
denise 1b540626ed CC-3900: Show Builder boxes remain checked even when the item is no longer visible 
-only visible tracks can be added/deleted
 2012-06-05 11:20:00 -04:00
denise 5e894f7351 CC-3893: Add Media: Red underline appears on the bottom 
-fixed
 2012-06-05 11:19:59 -04:00
denise 05378f52d3 CC-3896: Playlist Builder: Using "select this page" to add songs to playlist, those songs will be added in by opposite order, like a stack 
-fixed
 2012-06-05 11:19:59 -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 19d5655779 CC-3837: Calendar -> Add Show: Show's duration check does actually allow to create less than 25 hours' show. 
-fixed to only allow 24h or less
 2012-06-05 11:19:59 -04:00
denise 25ff2b3c3a CC-3873: "Reset e-mail" procedure leads to a certain page with no ability to navigate back from it 
-added "Back to login screen" link
 2012-06-05 11:19:59 -04:00
denise 3566480999 CC-3888: Record Show: ON AIR light and scheduled Play will ON for several seconds when a record show starts 
-fixed
 2012-06-05 11:19:59 -04:00
Martin Konecny b6446442ba CC-3917: record_date field in recorded shows causing problem 
-fixed
 2012-06-04 11:43:41 -04:00
Martin Konecny 43f57c0f8b CC-3902: Help -> Getting Started: Step 2 is optional now 
-fixed
 2012-06-03 22:55:49 -04:00
Martin Konecny 54d741972a CC-3903: Help -> Getting Started: the link "user manual" is different from the menu item "Help -> User Manual" 
-fixed
 2012-06-03 22:51:23 -04:00
Martin Konecny 89c0583849 CC-3926: System -> Stream setting: input ' into "Name/Description" will cause PDOException 2012-06-03 22:39:42 -04:00
denise b76d602561 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-30 14:12:28 -04:00
denise 33e97e7b40 - changed trial-end-date box to have a fixed position 2012-05-30 14:12:18 -04:00
Paul Baranowski 4fec2d3982 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-30 13:59:34 -04:00
Paul Baranowski 81fb81af74 CC-3904: Help -> about: Year 2011 should be 2012 
Fixed.
 2012-05-30 13:59:06 -04:00
James e1a86d50f6 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-30 12:46:30 -04:00
James e48b2f2a84 CC-3913: Live Stream: When master switch is turned on, it turns off show switch 
- fixed
 2012-05-30 12:46:05 -04:00
Naomi Aro 1a49173d2f CC-3860 : Timeline: Can knock a current playing song out of place with drag and drop if current playing song has checkbox selected 2012-05-30 17:46:24 +02:00
denise 3277a81221 - moved calcAdditionalShowData call before currentShow and nextShow get assigned 2012-05-29 14:19:31 -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 396795e70e CC-3879 : Now Playing-> Guest's clicking on Preview pops up error window 2012-05-28 17:59:26 +02:00
denise 561934c8ef SAAS-244: Live chat box appears in stream-player and preview windows 
-fixed
 2012-05-25 16:23:33 -04:00
denise 925f98e3d0 SAAS-242: Livechat window obscures trial end date graphic 
-fixed
 2012-05-25 15:48:27 -04:00
denise f35f561f67 CC-3797: Feedback Metrics "Show Me What I Am Sending" doesnt show all of the fields that are being sent 
- removed 'SAAS'
 2012-05-25 10:49:40 -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 8b4c876c5b CC-3884 : UI constantly refreshes when filtered by a show in a timerange 2012-05-24 17:33:15 +02:00
Naomi Aro 1b115178d3 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 15:50:29 +02:00
Naomi Aro 6b8adff769 CC-3876 : "open the library to schedule files" button should be disabled for 'guest' users and DJ's not assigned to this show 2012-05-24 15:08:54 +02:00
Martin Konecny eb4207dd1d CC-3863: Stats should not send version number with extra characters 
-fixed
 2012-05-23 17:25:16 -04:00
James b28a700005 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-23 17:17:00 -04:00
James a6dc2adb78 CC-3874: after 3 unsuccessful attempts to login no RE-CAPTCHA is shown and 
you can't even login as admin user

- fixed
 2012-05-23 17:14:59 -04:00
denise 80998f2eac Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-23 16:19:06 -04:00
denise 28a383e960 - fixed check for currentShow's end boundary to only be greater than current time 2012-05-23 16:18:59 -04:00
Martin Konecny 1edfb097da Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-23 16:17:37 -04:00
James 01439663d9 CC-3863: Stats should not send version number with extra characters 
- fixed
 2012-05-23 15:06:22 -04:00
James 4c317d1891 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-23 14:56:05 -04:00
James a969599986 CC-3858: Record and Rebroadcast Creation Problem\ 
- fixed
 2012-05-23 14:55:55 -04:00
Naomi Aro bf614dd729 CC-3870 : Now playing -> "Add n items" displays wrong "n" when drag and drop tracks to Time Line 2012-05-23 17:40:56 +02:00
Naomi Aro 0c233c3346 CC-3860 : Timeline: Can knock a current playing song out of place with drag and drop if current playing song has checkbox selected 2012-05-23 17:06:04 +02:00
Naomi Aro 0b84dec86f CC-3862 : Now playing -> Time Line: Left clicking and "Select cursor" won't enable to add current selected track from Media Library 2012-05-23 12:18:51 +02:00
Martin Konecny 4608f04140 remove useless logging 2012-05-23 00:43:05 -04:00
denise 773693f636 - fixed spelling mistake on variable 'songElapsedTime' in dashboard.js 2012-05-22 17:47:46 -04:00
James 164c158c80 CC-3859: Playout History: Filter out songs that are not played out 
- done
 2012-05-22 17:39:27 -04:00
denise 453b343284 SAAS-223: Airtime Usage Metric: Amount of time spent broadcasting 
- fixed setting end_time
 2012-05-22 16:53:04 -04:00
Martin Konecny b2f39ae66b CC-3810: NowPlaying Bar during a recorded show looks scary in 2.1 (much nicer in 2.0.3 and earlier) 
-introduced small problem, now fixed
 2012-05-22 16:33:18 -04:00
James c7a551fe84 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-22 16:13:11 -04:00
James 6da923ace1 CC-3859: Playout History: Filter out songs that are not played out 
- db change and upgrade.
 2012-05-22 16:11:25 -04:00
Martin Konecny 6b44792c11 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-22 12:22:11 -04:00
Martin Konecny bbd694eb10 CC-3810: NowPlaying Bar during a recorded show looks scary in 2.1 (much nicer in 2.0.3 and earlier) 
-introduced small problem, now fixed
 2012-05-22 12:22:03 -04:00
Vladimir c460670486 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-22 17:58:09 +02:00
Vladimir 6d88b21a8f CC-3846: changed CSS for info icon, it should fix the positioning issue 2012-05-22 17:53:51 +02:00
Naomi Aro 2658b39585 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-22 17:52:04 +02:00
Naomi Aro 428b13f3d7 CC-3803 : Don't allow editing of a current Record show 2012-05-22 17:51:53 +02:00
Martin Konecny 8720aabc27 CC-3857: Chmod fixes for files which should not be executable 
-fixed
 2012-05-22 11:22:43 -04:00
Naomi Aro 438bc93133 CC-3851 : Preview Player: does not expand on Chrome, too big on Firefox 2012-05-22 15:03:34 +02:00
Naomi Aro 95003c3571 CC-3712 : Trial end date overlaps with Airtime Clock 2012-05-22 12:45:42 +02:00
Naomi Aro 78fe946e57 CC-3712 : Trial end date overlaps with Airtime Clock 2012-05-22 12:40:08 +02:00
Naomi Aro d47514c4db CC-3845 : General UI cleanup 2012-05-21 18:28:19 +02:00
Naomi Aro 4fe80194b6 CC-3845 : General UI cleanup 2012-05-21 17:07:34 +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
Martin Konecny bbc101bde8 CC-3810: NowPlaying Bar during a recorded show looks scary in 2.1 (much nicer in 2.0.3 and earlier) 
-fixed
 2012-05-20 23:30:03 -04:00
denise d0211aaca9 SAAS-208: airtime-system: create a option which can set the live stream connection setting 
-done
 2012-05-18 19:08:50 -04:00
denise 42f75634fc CC-3854: Crash on Adding Show 
-fixed
 2012-05-18 18:57:22 -04:00
denise f3840f6eac CC-3796: If you change the show's start and end time, the length of content will be displayed as ".00" 
-refactored empty check on $time
 2012-05-18 17:54:58 -04:00
denise d7eb9a9d95 SAAS-238: Password reset: hide these options in the preferences, allow them to be set using airtime-system command 
- changed "Airtime System Email" label on System->Preferences form
 2012-05-18 14:50:42 -04:00
denise 8710c00970 SAAS-238: Password reset: hide these options in the preferences, allow them to be set using airtime-system command 
-these options are hidden is instance is saas
 2012-05-18 12:58:09 -04:00
Naomi Aro 766f897dfe CC-3845 : General UI cleanup 2012-05-18 16:20:33 +02:00
Naomi Aro bb084f5a85 CC-3845 : General UI cleanup 2012-05-18 16:11:22 +02:00
Naomi Aro 560b9da239 CC-3845 : General UI cleanup 2012-05-18 16:01:24 +02: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
denise 8ad336858e CC-3747: Metadata popup should also show the filepath of the track 
- fixed 'File Path' from breaking into 2 lines in Chrome
 2012-05-17 18:53:40 -04:00
denise 3ba4551ed3 - increased amount of time is allowed to pass before ON-AIR light is turned off 2012-05-17 18:49:06 -04:00
denise 8ed2efe770 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-17 18:27:06 -04:00
denise 9967f5451c CC-3737: ON AIR turns to grey from time to time, while the stream keeps playing 
- fixed
- added a 'type' key to distinguish between tracks and shows
 2012-05-17 18:21:58 -04:00
Paul Baranowski 6d75b4fc06 The fix for long connection strings in "Add Show" form caused the tooltips to 
be displayed incorrectly (hidden).  Reverted that change.

Fixed display of "Stream URL" in the stream settings.
 2012-05-17 18:07:41 -04:00
Paul Baranowski 869eb77ca4 CC-3611: Show Form: "Repeats" font is wrong, info images in the wrong place 
Fixed both of these issues.

Fixed issue with connection URLs in "Add Show" and in "Stream Prefs" where
the text was unstyled.

Fixed issue with long connection URLS causing display problems
in "Add Show" and in "Stream Prefs".  Now a scrollbar will appear if the
connection URL is too long.

Fixed bug in Stream Prefs where zooming out caused the page to be formatted
differently.

Fixed bug in Stream Prefs where the labels "Master Source Connection URL" and
"Show Source Connection URL" wrapped on multiple lines.

Fixed help text for Add Show -> Live Stream authication settings, the
instructions were wrong and there were misspelled words.
 2012-05-17 17:33:50 -04:00
Paul Baranowski 228f699943 CC-3609: Stream settings page layout works better now, the two panels 
are now placed next to each other.
 2012-05-17 15:06:14 -04:00
Naomi Aro fd0d82a873 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-17 17:53:23 +02:00
Naomi Aro 45ef2af142 CC-3420 : Custom UI for jplayer from CC-3395 2012-05-17 17:53:01 +02:00
denise 8abb57c402 CC-3842: Next scheduled show gets registered as next scheduled song 
- removed case where light stays on for first 5 seconds of track
- also removed function calls no longer in use (notifySongStart(), and notifyShowStart())
- removed nowplayingdatagrid.js since it is no longer in use
 2012-05-17 11:23:24 -04: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
denise 1629f41a8d CC-3737: ON AIR turns to grey from time to time, while the stream keeps playing 
-fixed
 2012-05-16 12:54:02 -04:00