Commit graph

1901 commits

Author SHA1 Message Date
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