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
Naomi Aro 5828b2037d CC-3102 : Show Editing, how it uses day of the week 2011-11-26 13:31:42 +01:00
Martin Konecny b16fa16042 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-26 00:06:29 -05:00
Martin Konecny 317bed8643 CC-3094: Rebroadcast editing problems
-Fixed
2011-11-26 00:06:17 -05:00
Yuchen Wang 197997fee7 CC-3093: SoundCloud preferences do not have email or password as required fields + firefox auto-fills the password field
Mask the password instead of hiding it
2011-11-25 21:52:31 -05:00
Yuchen Wang 41eeefe427 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-25 21:34:05 -05:00
Yuchen Wang f03b875e06 CC-3084: After canceling a repeating show that is being played currently, the progress bar is still going at the top
Deleted show was being returned because we don't delete it from database if it's repeating, nor do we check
if it's modified when querying the db.

Fixed by checking modified_instance column; only return it if modified_instance != TRUE
2011-11-25 21:33:42 -05:00
Martin Konecny ff998ea6f2 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-25 17:36:23 -05:00
Martin Konecny b1193318ed CC-3105: Settings dates (the popup select date calendar) shows Today by local machine timezone and not Airtime timezone.
-fixed
2011-11-25 17:36:11 -05:00
James 267d48f640 SAAS-82: Add "airtime-system --status" command
- add a function that returns just global data of stream setting
2011-11-25 17:33:59 -05:00
James c9644d4a73 CC-3077: Preference/stream-setting page has no Vorbis metadata option
- cleaning up some code
2011-11-25 15:38:29 -05:00
Naomi Aro c21cbeb73b CC-3102 : Show Editing, how it uses day of the week 2011-11-25 16:07:03 +01:00
Yuchen Wang 5222fe71a5 CC-3089: Link to manual in Help menu should point to manuals.sourcefabric.org rather than flossmanuals.net
Updated per Paul's comment
2011-11-24 17:10:56 -05:00
Yuchen Wang 370d6e1fba CC-3104: Timezone issues in the widget
Added is_numeric check
2011-11-24 17:08:52 -05:00
Yuchen Wang 485a0e8cc6 CC-3093: SoundCloud preferences do not have email or password as required fields + firefox auto-fills the password field
I just realized this:
1. Enable "Enable Soundcloud Upload" in preference and fill in the username+password, click save
2. Go back to preference, change unrelated setting like "Station Name", click save
3. Now since soundcloud password field is empty (expected, as we don't want others to see how many digits
are there), the save failed

This commit is to fix this. Created another custom validator for the password field, which does the same
thing as ConditionalNotEmpty validator but allow password field to be empty when the username/email field
wasn't changed.
2011-11-24 15:45:39 -05:00
Yuchen Wang ee3a6ecd84 CC-3089: Link to manual in Help menu should point to manuals.sourcefabric.org rather than flossmanuals.net
Fixed
2011-11-24 14:10:04 -05:00
Yuchen Wang b84c51212a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-24 14:05:38 -05:00
Yuchen Wang 00cb9e8753 CC-3108: Version update indicator: Wrong message for minor version update
Fixed
2011-11-24 14:03:37 -05:00
Yuchen Wang 276607c302 CC-3104: Timezone issues in the widget
For a previous ticket, I changed the code so that both "Today's Program" widget
and "Now Playing" widget both use the liveInfoAction, but forgot that for "Now Playing" widget, it retrieves
the shows within next 48 hours instead of within end of day today...

Fixed by passing GET parameters to liveInfoAction, specify whether we want to retrieve shows within an
interval or end of day. Also added a GET parameter for specifying the number of shows to display.
2011-11-24 13:54:58 -05:00
Naomi Aro 40b99dfc0f CC-3085 : Repeating shows get added to the wrong days 2011-11-24 19:39:08 +01:00
Naomi Aro 54ef9f2b03 CC-3102 : Show Editing, how it uses day of the week
not sure if this change should be here anymore yet.
2011-11-24 17:10:49 +01:00
Naomi Aro e68d7afa3f CC-3102 : Show Editing, how it uses day of the week 2011-11-24 16:20:17 +01:00
Naomi Aro 5c7828c1f5 CC-3102 : Show Editing, how it uses day of the week 2011-11-24 11:56:24 +01:00
Martin Konecny 37c89d96d9 CC-3095: Context menu of rebroadcasting show doesn't work
-fixed
2011-11-23 18:24:11 -05:00
James eb19d461fe Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-23 17:10:25 -05:00
James a886b53d74 CC-3077: Preference/stream-setting page has no Vorbis metadata option
- done
2011-11-23 17:03:30 -05:00
Yuchen Wang 288fa86782 CC-3100: Remove "development" env variable from default .htaccess file
Removed the line "SetEnv APPLICATION_ENV development"
2011-11-23 16:58:21 -05:00
Yuchen Wang 980c8b2fae Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-23 16:17:40 -05:00
Yuchen Wang ef9a4cd850 CC-3093: SoundCloud preferences do not have email or password as required fields + firefox auto-fills the password field
Forgot to stage this file in last commit...
2011-11-23 16:17:21 -05:00
Yuchen Wang 008278c7ec CC-3093: SoundCloud preferences do not have email or password as required fields + firefox auto-fills the password field
Fixing bug introduced by last commit...Should test more thoroughly next time...

Fixed by creating and adding a custom validator that checks if the field is empty only when some other
fields have specific values, in this case, when 'UploadToSoundcloudOption' has a value of '1'.
2011-11-23 16:15:51 -05:00
James 7ac13d26f0 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-23 14:12:34 -05:00
James ab0dc64ba9 CC-3086: When uploading a file to /tmp filename collisions can occur
- mktemp is used to generate temp name within /tmp dir
- it generate temp file when the file gets uploade to /tmp and then copy to
organize folder as original file name
2011-11-23 14:12:14 -05:00
Naomi Aro 87886b039f CC-3083 Must convert to UTC start/end times using the timezone start/end times 2011-11-23 19:11:48 +01:00
Naomi Aro ab98bad5b4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-23 18:53:47 +01:00
Yuchen Wang d3df4b14d2 CC-3093: SoundCloud preferences do not have email or password as required fields + firefox auto-fills the password field
- Make the form fields required
- Append "Required" label to the fields
- Disable autocomplete for the fields
2011-11-23 12:52:35 -05:00
Naomi Aro 685e5e03c4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-23 18:49:13 +01:00
Naomi Aro 65fb00ad8d CC-3083 Must convert to UTC start/end times using the timezone start/end times 2011-11-23 18:47:44 +01:00
Yuchen Wang 161fa80d64 CC-3091: Widget "Today's Program" doesn't show any content
It's not showing anything because I thought it's not suppose to display the currently playing show.
Fixed by retrieving the currently playing show along with next shows, and display them.

todayInfoAction is no longer needed since liveInfoAction does the same thing.
2011-11-23 12:00:54 -05:00
Yuchen Wang 37da2bf0c5 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-23 10:39:40 -05:00
Yuchen Wang 8766cade49 CC-3092: Station Information: not able to upload logo
- Adding a return statement fixed it...I don't what was I thinking...

- Some indention seems messed up, fixed it
2011-11-23 10:39:05 -05:00
Martin Konecny 8231df6c44 CC-3080: Select stream: drop-down menu does not really select stream, makes no difference to output quality on Firefox 3.6
-should be fixed.
2011-11-23 10:30:39 -05:00
Martin Konecny 212205b0ff CC-3070: Scheduling show on the 31st of a month causes problem to months that don't have 31 days
-fixed.
2011-11-22 18:03:47 -05:00
James add6d167e3 CC-3071: Show adding "When" improvements
- fixed
- the issue is that it wasn't incrementing the date.
- rewrote the code(cleaner and more intuitive)
2011-11-22 10:35:01 -05:00
Yuchen Wang 72553a257d CC-3066: "Now Playing" Widget doesn't display the currently playing show when it should be
Convert to UTC time before calling model functions
2011-11-21 18:10:29 -05:00
Yuchen Wang ac74ca2449 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-21 18:04:19 -05:00
Yuchen Wang 86729475f6 CC-3067: Shows in frontend widgets appear on the wrong day after changing timezone
- Converting times to UTC timezone in ApiController before sending them to model functions

- Added utility functions in DateHelper.php

- GetShowsByDayOfWeek has been removed due to bugs caused by using local timezone
based variable like $day, which represents day of the week in local time, in db query,
which has times saved in UTC timezone. Converting stuff like day of the week from local
to UTC is messy. GetNextShows(...) can do the job so WeekInfoAction now uses it instead
2011-11-21 18:03:56 -05:00
James bbbdfac21f CC-3071: Show adding "When" improvements
- fixed
2011-11-21 15:01:55 -05:00
James 65f2dd065b CC-3063: Live Stream Window: It doesn't play Shoutcast stream
- fixed. need special string appended when the stream is from shoutcast
- ';stream/1' need to be appended on shoutcast url.(that's how jplayer works)
2011-11-21 11:57:36 -05:00
James d4a02a655c Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-21 11:39:42 -05:00
James 19eb5abe12 CC-3063: Live Stream Window: It doesn't play Shoutcast stream
- fixed. flash fallback point was invalid.
2011-11-21 11:38:56 -05:00
Martin Konecny 864e697cc0 CC-3068: Day/Week view and Month view under Calendar page have different ideas about what day is today
-fixed "today" button behaving incorrectly.
2011-11-20 20:53:05 -05:00