Commit graph

7793 commits

Author SHA1 Message Date
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
791d1dae1b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-17 17:34:28 -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
Martin Konecny
28fecd9024 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-17 16:30:46 -04:00
Martin Konecny
b2c63544a9 CC-3840: Deleting current playing item sometimes results in random next track playing
-possibly fixed
2012-05-17 16:30:40 -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
Martin Konecny
f53a9c1811 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-17 13:12:26 -04:00
Martin Konecny
c91f1cc0c9 incorrect sql statements 2012-05-17 13:12:13 -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
1c88fb74f3 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-17 11:23:34 -04: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
Martin Konecny
0991b00c55 CC-3839: Remove "-s" option from airtime-install
-done
2012-05-17 10:24:32 -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
Martin Konecny
9ed4ca4259 CC-3838: Exception in "airtime-test-stream"
-fixed
2012-05-16 17:26:18 -04:00
Martin Konecny
105d752ada CC-3840: Deleting current playing item sometimes results in random next track playing
-possibly fixed
2012-05-16 17:12:47 -04:00
Martin Konecny
6098fa20e2 CC-3841: Remove "airtime-show-recorder" initd script on upgrade
-fixed
2012-05-16 16:55:40 -04:00
Martin Konecny
a4716ac36f CC-3839: Remove "-s" option from airtime-install
-done
2012-05-16 16:39:13 -04:00
Martin Konecny
97df2ee6c7 CC-3840: Deleting current playing item sometimes results in random next track playing
-possibly fixed
2012-05-16 16:27:38 -04:00
Martin Konecny
30b0aa5d48 -remove double quotes from sql statements 2012-05-16 15:39:05 -04:00
Martin Konecny
07afbc77ce -more description in 2.1.0 upgrade script 2012-05-16 15:38:44 -04:00
Martin Konecny
b677d2985b -remove useless to utf8 conversions 2012-05-16 15:38:26 -04:00
Martin Konecny
6bfb0078b9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-16 13:30:24 -04:00
Martin Konecny
9cff3cf3fe CC-3835: Backup database before performing database upgrade to 2.1
-done
2012-05-16 13:30:00 -04:00
Martin Konecny
f052c121e1 CC-3836: On install, If Airtime is not previously installed, overwrite files in /etc/airtime
-done
2012-05-16 12:57:11 -04: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
Martin Konecny
fd70768910 fix bug with pypo crashing 2012-05-16 10:28:30 -04:00
Martin Konecny
4a85be79b8 CC-3683: Upgraded database not equivalent to fresh install database part 1 2012-05-15 18:45:00 -04:00
Martin Konecny
452c14fcb7 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-15 17:37:06 -04:00
Martin Konecny
191de74bae CC-3811: Error found in Media Monitor and Apache's log about Media Monitor try to store recorded file 2012-05-15 17:36:33 -04:00
Martin Konecny
4fd7cd75e9 CC-3828: Pypo push crashed
-fixed
2012-05-15 17:35:44 -04:00
Paul Baranowski
c5b1e23486 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-15 17:13:20 -04:00
Paul Baranowski
2856d379b5 Fixed bug with upgrade notifications - it was always saying that your version
is obsolete if the version was greater than 1 minor version.
2012-05-15 17:13:01 -04:00
denise
821484d81a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-15 15:43:16 -04:00
denise
e0c53afe0b CC-3796: If you change the show's start and end time, the length of content will be displayed as ".00"
-fixed
2012-05-15 15:43:06 -04:00
Martin Konecny
1921b26943 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-15 15:17:58 -04:00
Martin Konecny
1245d1e860 CC-3826: Couldn't find constant MDATA_KEY_RECORD_DATE
-fixed in a better way
2012-05-15 15:17:19 -04:00
denise
61fd560daa Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-15 15:11:04 -04:00
denise
b96f0590b1 CC-3808: No tooltip for preview playlist
-done
2012-05-15 15:10:56 -04:00
Martin Konecny
6695e3e190 -fix javascript error in widgets 2012-05-15 14:35:01 -04:00
Martin Konecny
4b03a45d46 CC-3757: Widgets: ON AIR show's elapsed and remaining time are wrong
-fixed
2012-05-15 14:20:53 -04:00
Martin Konecny
55b0715142 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-15 12:35:15 -04:00
Martin Konecny
025ef0ed27 CC-3826: Couldn't find constant MDATA_KEY_RECORD_DATE
-fixed
2012-05-15 12:35:02 -04:00
denise
c4c988b98a CC-3797: Feedback Metrics "Show Me What I Am Sending" doesnt show all of the fields that are being sent
-now shows all keys, null or not, in the list
2012-05-15 11:54:11 -04:00
Naomi Aro
d2dc02cf9e CC-3777 : Decide on what should happen with canceling recorded show 2012-05-15 15:07:42 +02:00
Naomi Aro
07d029b8cc CC-3777 : Decide on what should happen with canceling recorded show 2012-05-15 14:56:31 +02:00
Naomi Aro
6a2bab66fa CC-3825 : Deleting any recorded show cancels the current recording show 2012-05-15 13:02:24 +02:00
Martin Konecny
4a6a31c5a4 CC-3791: Media Monitor crash when there are media files with non-ascii name in watched folder
-indent error
2012-05-14 19:55:38 -04:00