Commit graph

905 commits

Author SHA1 Message Date
Yuchen Wang
9523174a0f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-12-05 16:27:27 -05:00
Yuchen Wang
6591523452 SAAS-93: Switch link for Trial box
Done.
2011-12-05 16:27:17 -05:00
Martin Konecny
73c0408315 CC-3153: When cancelling a show that is currently on-air, the show-instance is not removed.
-fixed
2011-12-05 12:56:16 -05:00
Martin Konecny
0440eb7539 CC-3160: Once Hardware dropdown is changed, stream information does not refresh
-fixed
2011-12-05 12:34:11 -05:00
Martin Konecny
beab24d068 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-12-05 12:04:13 -05:00
Martin Konecny
20f0f5e523 CC-2926: Clicking "Choose File" in support settings to upload image defaults to "Audio/MPEG" type in Chrome
-Fixed.
2011-12-05 12:04:02 -05:00
lukabazuka
07d77f0957 CC-3138
Signed-off-by: lukabazuka <vladimir.stefanovic@sourcefabric.org>
2011-12-05 17:00:15 +01:00
Martin Konecny
2bf4c93e5c CC-3160: Once Hardware dropdown is changed, stream information does not refresh
-Fixed one error...a few more to go.
2011-12-04 21:47:11 -05:00
Martin Konecny
5a4b4ba421 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-12-02 16:23:03 -05:00
Martin Konecny
efbaebbbf5 CC-3153: When cancelling a show that is currently on-air, the show-instance is not removed.
-fixed
2011-12-02 16:22:54 -05:00
Martin Konecny
82f3a25f69 -set log path earlier 2011-12-02 15:06:21 -05:00
Yuchen Wang
ee5b675562 CC-3147: Change text in help > Getting Started: "Only admins can add shows."
Fixed
2011-12-02 13:57:40 -05:00
Yuchen Wang
9991cbd16b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-12-02 13:55:39 -05:00
Yuchen Wang
30f36177b7 CC-3141: Capitalization of SHOUTcast in stream settings page
Fixed
2011-12-02 13:54:37 -05:00
James
043f0c29a1 CC-3074: Give users the choice of which hardware sound API they wish to
use (instead of hardcoded to ALSA)

- finished everything except LS part(including upgrade and UI)
2011-12-02 13:39:14 -05:00
Naomi Aro
06cbe215a3 CC-3149: Playlist Builder, fix JS for editing title/description 2011-12-02 17:49:48 +01:00
Naomi Aro
966dd49610 CC-3094 : Rebroadcast editing problems 2011-12-02 16:24:11 +01:00
Naomi Aro
198340ac67 CC-3094 : Rebroadcast editing problems 2011-12-02 13:31:54 +01:00
Naomi Aro
878fa3461d CC-3094 : Rebroadcast editing problems 2011-12-02 12:06:09 +01:00
Naomi Aro
b7a9e89095 CC-3143 : Allow content to be scheduled in an overlapping show.
removing check for scheduling an overlapping show, doesn't make sense with new resize rules.
2011-12-01 11:37:55 +01:00
Naomi Aro
f15429c8d6 CC-3144 : Search box shows Track, Show Contents box shows Genre
replaces track number with genre.
2011-12-01 11:16:29 +01:00
Yuchen Wang
0d4e1d21e2 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-30 16:12:53 -05:00
Yuchen Wang
0193eec89e CC-3139: Undefined index errors in Live stream player after fresh install
Got SQL syntax mixed up with PHP...
2011-11-30 16:10:40 -05:00
Martin Konecny
17884dbe49 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-30 11:41:24 -05:00
James
48d9d2d93b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-29 20:16:01 -05:00
James
9c65bfeba7 CC-3131: Latency of stream authentication warning in Stream Settings page
- it compares boot time of liquidsoap and the time user clicks on "Save"
on stream setting page. The status only gets updated if the
"boot_time" > "user update time"
- as soon as a user click on save, status is set to "wating"
- since there is no timing issue, quering interval is reduced to 1 sec
2011-11-29 20:15:38 -05:00
Martin Konecny
9e39bba2c6 -remove APPLICATION_ENV from .htaccess file 2011-11-29 17:42:06 -05:00
Yuchen Wang
4d6c3fdbf4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-29 16:25:43 -05:00
Yuchen Wang
53aecd1c00 CC-3130: Disabling a Shoutcast stream causes the service type to revert back to Icecast
This happens because we use same field in the db to store whether stream is disabled, and which
type is it (Icecast/Shoutcast). Thus when we disable a stream, we forget about the fact that
it was set to Shoutcast before.

Fixed by separating out the enable/disable state from stream type.
Whether a stream is enabled/disabled is stored in new fields sx_enable.
Stream type is stored in the old fields, sx_output.
2011-11-29 16:25:30 -05:00
Martin Konecny
bc7553a5fc CC-3099: Does Airtime upgrade work when the database username + password is changed from default?
-fixed for non-install issues as well.
2011-11-29 16:07:38 -05:00
Martin Konecny
573ff0c4d7 re-add APPLICATION_ENV variable 2011-11-29 15:48:14 -05:00
Martin Konecny
8b8b2e6fb4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-29 15:19:46 -05:00
Martin Konecny
d4c701dd6a CC-3072: Test upgrade to 2.0.0 from 1.8.0 and up (including minor versions, except 1.9.1) 2011-11-29 15:19:40 -05:00
James
85b8209db9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-29 13:09:51 -05:00
James
49df56a0f6 CC-3135: Typo in Stream Settings -> Global Settings, says Ouput
instead of Output

- fixed
2011-11-29 13:09:23 -05:00
Naomi Aro
dbc65983e2 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-29 17:22:23 +01:00
Naomi Aro
5b7788957e CC-3137 : Cleaning Up Old Playlist Stuff
unused view.
2011-11-29 17:22:17 +01:00
Yuchen Wang
fc24380526 CC-3132: Live stream window needs a space in the title
Fixed
2011-11-29 11:17:29 -05:00
Yuchen Wang
57d45a4f84 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-29 11:13:52 -05:00
Yuchen Wang
c430e0bd6a CC-3125: Small capitalization errors on SoundCloud text labels
Fix for the preference page
2011-11-29 11:13:39 -05:00
Naomi Aro
9f7ad53106 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-29 17:11:29 +01:00
Naomi Aro
4c4c401c9c CC-3137 : Cleaning Up Old Playlist Stuff 2011-11-29 17:11:19 +01:00
lukabazuka
c81228147f CC-3090
Signed-off-by: lukabazuka <vladimir.stefanovic@sourcefabric.org>
2011-11-29 16:55:36 +01:00
Naomi Aro
22e48d042a CC-3137 : Cleaning Up Old Playlist Stuff 2011-11-29 16:35:52 +01:00
Naomi Aro
606c52470a CC-3137 : Cleaning Up Old Playlist Stuff
adding new playlist to the library.
2011-11-29 16:24:41 +01:00
Naomi Aro
01576b33c8 CC-3137 : Cleaning Up Old Playlist Stuff
when a user clicks new the intermediate playlist metadata screen in gone now, just can edit title/desciption inline on the main editor.
2011-11-29 16:20:09 +01:00
Naomi Aro
c17be6d938 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-29 15:30:30 +01:00
Naomi Aro
8646432cce CC-3038 : Playlists offsets not dynamically updating
refreshes view when a cue/fade is set like all other playlist actions
calling function setSPLContent
2011-11-29 15:30:05 +01:00
Yuchen Wang
329c735ea4 CC-3125: Small capitalization errors on SoundCloud text labels
Fixed
2011-11-28 16:20:34 -05:00
Naomi Aro
f1e1b747ad Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-26 13:32:05 +01:00