Martin Konecny
58b4576ae1
CC-3297: Depend on zendframework and php-pear as external packages
...
-DB dependency should now be externalized
2012-02-06 14:18:03 -05:00
Naomi Aro
d9947b622a
CC-3174 : showbuilder
...
fixing times in CcPlaylistContents
2012-02-06 18:46:53 +01:00
Naomi Aro
613006e69c
CC-3174 : showbuilder
...
merge
2012-02-06 12:57:08 +01:00
Naomi Aro
e487b4a444
CC-3174 : showbuilder merges
...
adjusting format of default fade to not confuse DateTime.
2012-02-06 12:48:53 +01:00
Naomi Aro
9e08f857bf
CC-3174 : showbuilder
...
fixing merge with playlist tooltip
2012-02-06 11:59:20 +01:00
Naomi Aro
42452b8ea9
Merge branch 'CC-3174' into devel
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/application/controllers/PlaylistController.php
airtime_mvc/application/controllers/ScheduleController.php
airtime_mvc/application/models/Playlist.php
airtime_mvc/application/models/StoredFile.php
airtime_mvc/public/js/airtime/library/spl.js
2012-02-06 11:07:10 +01:00
Naomi Aro
8212624c4a
CC-3174 : showbuilder
...
fixed moving an item to an earlier position in a show,
timeline needs a width or connected list doesn't work.
place holder still has problems with floats.
2012-02-06 01:51:22 +01:00
Naomi Aro
16863ee95e
CC-3174 : showbuilder/library
...
playlist fades are working again, still need more error checking to be done.
2012-02-05 23:38:12 +01:00
Naomi Aro
6c2475bf1f
CC-3174 : showbuilder
...
mostly done with new context menu, need to finish
add/delete button actions on lib table for both screens.
2012-02-05 18:19:22 +01:00
Naomi Aro
e8f2506474
CC-3174 : showbuilder
...
changing playlist table to remove unused columns, adding foreign key to user, adding aggregate length column.
2012-02-04 21:26:21 +01:00
Naomi Aro
38f3d6bfb0
CC-3174: showbuilder/library refactoring
...
adding new context menu files, playlist is working except for editing fades.
2012-02-04 19:27:26 +01:00
Naomi Aro
46fdf56b70
CC-3174 : showbuilder
...
refactoring playlist to work with group add/delete by resource id and using transactions.
2012-02-04 15:52:31 +01:00
Daniel
d6bf95500c
CC-2065: Fade times longer than Airtime supports can be set in Playlist Builder and Preferences
...
- didn't change much fixed two bugs and changed formating.
- I introduced a but in Playlist.changeFadeInfo because for the general playlist fade in and out I didn't realize that these values are being set to the first and last elements. So I added a guard.
- I also updated the logic for Playlist.moveAudioClip so if new and old position are the same we just return
2012-02-03 18:19:13 -05:00
Naomi Aro
19f069b602
CC-3174 : showbuilder
...
can add items to a playlist with the refactoring.
2012-02-04 00:12:06 +01:00
Naomi Aro
1deebedf11
CC-3174 : showbuilder
...
throwing an exception if playlist doesn't exist.
2012-02-03 18:28:35 +01:00
Naomi Aro
0afa904ffe
CC-3174 : showbuilder
...
refactoring playlists for the group add/delete
2012-02-03 18:15:10 +01:00
Naomi Aro
6da4397a96
CC-3174 : show builder
...
can add playlists to the time line
upgraded datatables to 1.9
upgraded qtip2 to a newer version
put qtips on type column on lib table.
2012-02-02 23:15:39 +01:00
Daniel Franklin
7317b1d5af
CC-2065: Fade times longer than Airtime supports can be set in Playlist Builder and Preferences
2012-02-02 15:59:35 -05:00
Daniel Franklin
09ccac3384
CC-2065: Fade times longer than Airtime supports can be set in Playlist Builder and Preferences
...
- Fixed refresh bug that results in storing to database a 00.000000 value instead of 00:00:00
2012-02-02 15:30:05 -05:00
Daniel Franklin
61fb8a4fb9
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/application/Bootstrap.php
2012-02-02 14:49:08 -05:00
Daniel Franklin
03329ad2cf
CC-2065: Fade times longer than Airtime supports can be set in Playlist Builder and Preferences
...
- Updated the logic in the fade in/out loggic so the Time format 00:00:00 appears as the more practical seconds format 00.
- I also updated the error message so it includes the time unit seconds in the message.
2012-02-02 14:44:14 -05:00
Martin Konecny
11e0f3ead8
CC-3296: Sometimes the Current Playing Item on the top Panel in the UI incorrectly shows "Nothing Scheduled"
2012-02-02 14:11:03 -05:00
Naomi Aro
60ac01dd41
CC-3174 : show builder
...
scheduled item keeps same id after being moved.
2012-02-02 18:38:56 +01:00
Naomi Aro
e001cd24c1
CC-3174 : show builder
...
darg into and drag around in the timeline is now working.
need to change schedule table to not have auto incrementing ids
to preserve an item's id for REST.
(might find another way)
2012-02-02 18:13:20 +01:00
Naomi Aro
942cfaac25
CC-3174 : show builder
...
moving columns around in library to look better.
2012-02-02 01:29:50 +01:00
Naomi Aro
3aab811a3e
CC-3174 : showbuilder
...
fixing some css/js for display.
2012-02-01 23:33:20 +01:00
Naomi Aro
f5b2a23eb1
CC-3174 : showbuilder
...
group add/delete is working
2012-02-01 18:47:08 +01:00
James
4ffe79a286
CC-3290: A file should be removed from playlists if it is removed
...
through the interface
- fixed
2012-02-01 10:59:04 -05:00
Daniel Franklin
5d02581d38
CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI
...
Modified the error message to prepend a The, simple change.
2012-02-01 10:59:04 -05:00
Daniel Franklin
d495eac326
CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI
...
-fixed using the return result of the rename call to verifty the upload worked.
2012-02-01 10:59:04 -05:00
Naomi Aro
3d502b748f
CC-3174 : showbuilder
...
removing items recalulates everything correctly.
2012-01-31 21:39:34 +01:00
Daniel Franklin
de7bbbb479
CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI
...
Modified the error message to prepend a The, simple change.
2012-01-31 15:17:53 -05:00
Daniel Franklin
026f49ab31
CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI
...
-fixed using the return result of the rename call to verifty the upload worked.
2012-01-31 14:54:03 -05:00
Naomi Aro
fbda0e733b
CC-3174 : showbuilder
...
check into issue that propel doesn't return DateTime object in UTC.
using table tools to keep track of selected rows.
2012-01-31 18:59:27 +01:00
Naomi Aro
3f3117cf0e
CC-3174 : Show builder
...
creating a scheduling system to work with the new timeline in mind using propel.
2012-01-27 21:06:04 +01:00
Naomi Aro
f5761fd03c
CC-3174 : show builder
...
status icon on left side of table
static check mark in the footer currently
2012-01-26 19:10:37 +01:00
Naomi Aro
b0c3bace1c
CC-3174 : show builder
...
made sure the column reordering/visibility selection works with
modified show header/footer rows (their td spans the entire tr)
2012-01-26 15:21:04 +01:00
Naomi Aro
1080bf692f
CC-3277 : Overbooking a show to include 24+ hours of audio
...
truncating time values greater that the max allowed for time without timezone
2012-01-24 18:08:39 +01:00
Naomi Aro
ecaebbeb67
CC-3174 : Show builder, working on date choice pickers, make sure they accomodate client/server timezones.
2012-01-23 19:07:07 +01:00
Naomi Aro
fa872894f3
CC-3259 : change repeating state of show.
2012-01-18 16:21:46 +01:00
James
087d893a60
Merge branch 'airtime-2.0.x' into devel
2012-01-17 14:48:04 -05:00
Naomi Aro
3588cca654
CC-3258 : Deleting a rebroadcasting show deletes also the recorded show
2012-01-17 14:11:12 +01:00
Naomi Aro
a69be24831
CC-3256 : Recorded/repeated/rebroadcast is invalid after show update
...
only the original rebroadcasts are left when toggling the repeat option.
2012-01-17 12:45:05 +01:00
Naomi Aro
424206b9a9
CC-3174 : Show Builder
...
data tables column resizing, starting separating out events.
2012-01-17 11:18:17 +01:00
Martin Konecny
54ee177f7d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-01-16 13:58:45 -05:00
Naomi Aro
df33a457b1
Merge branch 'devel' into CC-3174
2012-01-16 09:58:02 +01:00
Naomi Aro
859213b760
CC-3174 Show Builder
...
experimenting
2012-01-16 09:56:57 +01:00
Yuchen Wang
9629e2bbae
Merge branch 'group_action_playlist_builder' into devel
2012-01-13 14:21:29 -05:00
Yuchen Wang
258521ffbf
CC-1977: Allow multiple files to be selected and acted upon in the library and playlist
...
- Fixed issues in "Manage Users" page
- Moved some code to more appropriate place
2012-01-13 14:17:39 -05:00
James
08a09e4096
CC-2977: Never delete files from the database
...
- using mtab(previous and current) files to figure out directories to be
added or removed
- adding index to cc_files
- see the tickets and media monitor design page for more info
2012-01-12 17:55:05 -05:00
Martin Konecny
79141fa070
CC-3240: When playlist is longer than a show, the now playing bar shows as if the playlist is still playing after show ends
...
-Fixed
2012-01-12 12:14:38 -05:00
Martin Konecny
d1de836a92
-make rabbitmq_host configurable via $_SERVER var (.htaccess etc.)
2012-01-11 16:28:03 -05:00
James
d5d4d50a9e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/application/models/StoredFile.php
airtime_mvc/application/models/airtime/om/BaseCcFiles.php
airtime_mvc/application/models/airtime/om/BaseCcFilesPeer.php
2012-01-11 12:31:54 -05:00
James
f6f1b143d7
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-01-11 12:18:28 -05:00
James
04b48d47cc
CC-2977: Never delete files from the database
...
- Files are marked deleted(file_exists to false) on deletion.
- Dirs are marked removed(removed flag to true) on removal of watched
folder in a usual way. If dir is unmounted, without being removed from
watched list first, it will be marked as not exists(exist flag to false)
- Manage Media Folders will show if dirs exist or not( mounted or not)
- Playlist builder will show if files exists or not
2012-01-11 12:17:48 -05:00
Yuchen Wang
ef141625a3
Merge branch 'group_action_playlist_builder' into devel
2012-01-10 14:46:31 -05:00
Yuchen Wang
d1d01e55ce
CC-1986: Configurable columns for media search
...
- added column 'utime' (upload time) and 'lptime' (last played time) in the tables cc_files and cc_playlist
2012-01-10 14:45:43 -05:00
Yuchen Wang
7f6d3cd942
Merge branch 'group_action_playlist_builder' into devel
2012-01-10 09:54:55 -05:00
Yuchen Wang
7a27be878b
CC-1986: Configurable columns for media search
...
- Added "Year" column
- Added "Upload Time" column
- Fixed some formatting issue
2012-01-08 22:31:18 -05:00
James
61c5355e8a
cc-2977: getting close!!!
2012-01-06 15:47:11 -05:00
Yuchen Wang
1c9b134748
CC-3183: recorder shows have extra 1ms which cause the now playing to report the show exceeding its time
...
Done
2012-01-04 17:10:14 -05:00
Martin Konecny
7247f75563
SAAS-135: Airtime status page reporting free space being incorrectly for Gluster FS mounts
...
-Done
2012-01-04 14:18:40 -05:00
James
5fa92f3d17
- temp commit on group action
2012-01-04 12:47:27 -05:00
Naomi Aro
905775552d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-12-27 14:34:27 -08:00
Naomi Aro
53d504f26e
CC-3110 : Password reset
2011-12-27 14:33:22 -08:00
Martin Konecny
a55b47efff
-Allow etc and stor directories to be configurable
2011-12-22 17:21:18 -05:00
Naomi Aro
52b0e3c5f9
CC-3110 : Password reset
...
basic functionality password reset using sendmail
2011-12-21 16:01:29 -08:00
James
7086444247
SAAS-94: Phone home metrics: Gather info about streaming setup
...
- fixed comment
2011-12-19 15:45:44 -05:00
James
018fa1d79c
CC-3213: Customer is unable to save Fade Out/Cue out for playlists
...
- fixed cue out/in issue
2011-12-19 14:55:23 -05:00
Martin Konecny
cdcdd9227d
-add vhost support
2011-12-19 00:11:45 -05:00
James
7c81fa29eb
CC-3192: Problem with web uploads for Airtime 2.0.0 beta2
...
- The bug was introduced with CC-3086. When file is large enough so
the pluload use chucking, it would create different temp name for each
chuck.
- Fixed it by using unique_name feature on plupload
2011-12-14 15:58:26 -05:00
Martin Konecny
9bbe1d14fa
-remove persistent connections from DB connections
2011-12-13 17:16:45 -05:00
Naomi Aro
e81c14c1db
CC-3185 : Live show can be dragged into a future date after the rebroadcasting
2011-12-13 13:04:03 +01:00
Naomi Aro
9275b21f48
CC-3177 : editing a show in the calendar brakes show edit form
2011-12-13 11:10:04 +01:00
Naomi Aro
c887fec86b
CC-3179 : shows populated date must be timestamp.
2011-12-12 21:11:05 +01:00
Naomi Aro
72952024b7
CC-3177 : editing a show in the calendar brakes show edit form
...
will only update shows if the duration is 24:00 or less.
2011-12-12 12:11:31 +01:00
Yuchen Wang
83f02c3408
SAAS-57: Add LiveChat to Airtime Pro
...
Adding client_id getter/setter to preference
2011-12-08 17:23:46 -05:00
James
fd10393b01
SAAS-94: Phone home metrics: Gather info about streaming setup
...
- changes in Airtime repo side
- phone home stat sends stream info to data collection server
2011-12-07 10:31:16 -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
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
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
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
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
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
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
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
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
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
b84c51212a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-24 14:05:38 -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
James
a886b53d74
CC-3077: Preference/stream-setting page has no Vorbis metadata option
...
- done
2011-11-23 17:03:30 -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
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
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
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
Martin Konecny
21bbb983ac
CC-3065: When editing a show after changing timezone, the time listed under "When" displays time in old timezone
...
-fixed
2011-11-20 14:46:01 -05:00
Martin Konecny
9ab47d5eba
CC-3036: Deleted Show instances reappear
...
-Renamed deleted_instance to modified_instance
2011-11-18 12:20:25 -05:00
Martin Konecny
c773c5c674
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-18 11:59:27 -05:00
Martin Konecny
f3e1f63226
CC-3060: Apache errors: Undefined index: deleted_instance
...
-fixed
2011-11-18 11:59:15 -05:00
Yuchen Wang
15c84ddfdb
CC-2950: Tell users if they are running an out-of-date version or not
...
- changed default url to "http://airtime.sourcefabric.org "
2011-11-17 23:25:46 -05:00
Yuchen Wang
52052bd573
CC-2950: Tell users if they are running an out-of-date version or not
...
- added error checking to curl call
- added regex validation when storing link to latest version
2011-11-17 15:33:29 -05:00
Yuchen Wang
eae90862b1
CC-2950: Tell users if they are running an out-of-date version or not
...
Get rid of hardcoded url for downloading the latest version, and use the url
stored in the stat server instead
2011-11-17 14:10:26 -05:00
james
ad708d9983
CC-2156: Searching for a host and hitting ENTER submits the show form
...
- done. Had to port the code manually
2011-11-16 18:14:10 -05:00
Yuchen Wang
1fd29def27
CC-2436: Save pulldown settings
...
Move the code that updates the database for the "show entries" dropdown to
a more appropriate place.
2011-11-16 16:12:58 -05:00
Yuchen Wang
4820bb617b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-16 15:52:31 -05:00
Yuchen Wang
a0bf7c90ba
CC-2436: Save pulldown settings
...
Fixing the issue of "show entries" dropdown setting not being saved.
After some investigation, it seems like we're destroying the calendar
everytime we modify the dropdown value, and create a new one,
which explains why the new setting is not being saved.
Fixed by moving the code that handles the updating to the place after
we create the new calendar. This makes the code cleaner as well.
2011-11-16 15:52:05 -05:00
Martin Konecny
4f2adc3068
CC-3050: Comb through source code for dates being generated with date() function
...
-done
2011-11-16 14:06:59 -05:00
Martin Konecny
a5939afd3f
-fix minor typo
2011-11-16 12:59:01 -05:00
Martin Konecny
1e79363263
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-16 12:35:44 -05:00
Martin Konecny
17e59f61be
CC-3036: Deleted Show instances reappear
...
-Make sure we ignore deleted show instances in
all areas of Airtime.
2011-11-16 12:35:02 -05:00
Naomi Aro
12172e5ad5
CC-3035 : Should be able to resize a show, have it affect all future instances of the show
...
added a new resize function to Shows.php,
should not use ShowInstance resize method, since you cannot resize just one instance currently.
2011-11-16 16:32:04 +01:00
Martin Konecny
e5fc5d623d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/application/models/DateHelper.php
airtime_mvc/application/models/Show.php
2011-11-15 16:14:00 -05:00
Martin Konecny
a0217f715f
CC-3037: Nowplaying bar not showing current show
...
-fixed
2011-11-15 16:10:45 -05:00
Yuchen Wang
fdff88cb76
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-15 12:38:18 -05:00
Yuchen Wang
f6f58c9399
CC-3044: Error in system status seen in apache log
...
- Added check for length > 0 before trying to get property
- Got rid of repeating code
2011-11-15 12:37:54 -05:00
Naomi Aro
4bdf866aca
CC-3035 : Should be able to resize a show, have it affect all future instances of the show
...
resizing is only working for single instance currently like the past.
2011-11-15 18:22:21 +01:00
Naomi Aro
63d0163f15
CC-3047 : getting full calendar events setting editable flag incorrectly
2011-11-15 16:32:07 +01:00
Naomi Aro
61d8fa7baa
CC-3034 Record/Rebroadcast Shows have time problems
...
fixing some UTC to non UTC comparisons,
adding offsets properly to create a rebroadcast show's start/end time.
2011-11-15 15:20:33 +01:00
Martin Konecny
e3395ae1e5
CC-3036: Deleted Show instances reappear
...
-done.
2011-11-14 23:54:47 -05:00
Martin Konecny
c19b7f7c6e
Merge branch '1.9.1' into devel
...
Conflicts:
VERSION
airtime_mvc/application/configs/constants.php
airtime_mvc/application/models/MusicDir.php
install_full/ubuntu/airtime-full-install
install_minimal/include/airtime-upgrade.php
python_apps/api_clients/api_client.py
python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py
2011-11-14 21:19:56 -05:00
Yuchen Wang
709582b47d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-14 17:53:37 -05:00
Yuchen Wang
51c563f80b
CC-2950: Tell users if they are running an out-of-date version or not
...
1. changed the behavior so that the tooltip comes up on hover
2. changed stat server link to "http://stat.sourcefabric.org/airtime_latest_version "
3. only updates the db if version returned by stat server is valid
2011-11-14 17:52:50 -05:00
Martin Konecny
de33d3ccaf
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-14 16:08:54 -05:00
Martin Konecny
60281f4e90
CC-2972: Find better way to determine domain which pypo should download from.
...
-fixed
2011-11-14 16:08:45 -05:00
James
11a38476c3
SAAS-43: Automatically fill in customer info in the automated feedback system
...
on signup, do not display popup on login
- title needs to update with db access since airtime-saas can change title
- storing it to session variable is not an option
2011-11-14 16:05:19 -05:00
Yuchen Wang
becaf7a152
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-14 00:35:27 -05:00
Yuchen Wang
1a1db1892f
CC-2950: Tell users if they are running an out-of-date version or not
...
Initial implementation.
- added some code in phone_home_stat to retrieve latest version from stat server
and store result in db
- created new view helper VersionNotify.php, which queries and calculates version
difference, then returns the necessary information in html to the view files
- created new javascript file versiontooltip.js, which sets up the qtip stuff so that
when the version notification icon is clicked, a tooltip is displayed
2011-11-14 00:34:53 -05:00
james
8e283c9e02
SAAS-66: Ability to set the stream values from the command line
...
- done
- extra fix: Fixed a javascript issue when it always changed bitrate to 48,
when type is set to ogg
2011-11-13 15:34:26 -05:00
Martin Konecny
20fc49b7be
CC-3027: Current Show progress bar is wrong
...
-looks like it's working.
2011-11-12 00:04:37 -05:00
Martin Konecny
1a45a38055
-add function comments to Show.php
2011-11-11 22:55:46 -05:00
Martin Konecny
f7fb6ddff0
-better naming of show instance functions
2011-11-11 22:24:37 -05:00
Martin Konecny
42cde33648
CC-3030: Repeating shows is broken in devel branch.
...
-working towards using only DateTime objects
2011-11-11 17:25:49 -05:00
Martin Konecny
74d3c3aebc
CC-3030: Repeating shows is broken in devel branch.
2011-11-11 10:58:27 -05:00
James
b04b7ff010
CC-2848: Misc bugs from demo service
...
- Handling concurrency issue playlist section and show(canlendar) section
2011-11-10 15:35:27 -05:00
James
17016e5d40
CC-3028: Entry in a cc_show table never gets deleted
...
- fixed
2011-11-10 15:17:06 -05:00
James
6c740effde
SAAS-52: New auto-feedback metrics: 1) Debian or manual install,
...
2) SaaS or Non-SaaS
- done
2011-11-09 13:13:21 -05:00
James
a551e08fce
- cleaning up a dirty code
2011-11-09 11:27:17 -05:00
James
4b12b4e01e
SAAS-63: airtime-saas: Something is broken in Preference.php
...
- fixed
2011-11-09 10:15:44 -05:00
Yuchen Wang
963976b87e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-04 16:58:01 -04:00
Yuchen Wang
6ffecf80c8
CC-2965: Frontend widget displays shows in UTC time
...
Not only were frontend widgets showing UTC time,
the SQL query was also comparing UTC timestamp with local timestamps,
causing widgets to display shows in the wrong day, etc.
Another problem was that "On air today" widget was simply calling
GetNextShows which returns shows within next 48 hours.
Fixed by:
1. Under models/Show.php:
In the GetCurrentShow/GetNextShows/GetShowsByDayOfWeek functions,
added code to convert UTC timestamp to local timestamp or vice versa,
depending on which one is more suitable, in SQL queries, thus
removing inconsistency in timezones. Also, before returning query result,
added code to convert result to local timezone.
In GetNextShows, added an optional parameter endTime to limit the interval
of shows to get. This is useful for the "On air today" widget.
2. Under models/DateHelper.php:
Added a few timezone functions to help converting timezones easier in Show.php.
3. Under controller/ApiController.php:
Added todayInfoAction which is to be used by "On Air Today" widget.
2011-11-04 16:57:24 -04:00
James
6eff9d124e
CC-2994: Upgrade: database change for SoundCloud upload
...
- changed soundcloud_link_to_file length to 4096
2011-11-03 10:30:01 -04:00
James
8f6804155f
CC-2934: Phone Home Stat: it should work with new airtime-check-system
...
- initial commit
2011-11-01 14:52:27 -04:00
Martin Konecny
153e0df409
CC-2989: airtime-check-system should deal with the case when the web server is not accessible
...
-fixed some more inaccessible issues
2011-10-27 17:13:36 -04:00
Martin Konecny
d26e410799
CC-2997: Daylight savings time affects repeating shows.
...
-should work now
2011-10-25 16:49:44 -04:00
Martin Konecny
08b97c4583
CC-2991: Repeating a show is broken
...
-working
2011-10-24 17:26:45 -04:00
Martin Konecny
04b88d4344
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-10-24 16:59:16 -04:00
Martin Konecny
858990eb8c
CC-2991: Repeating a show is broken
2011-10-24 16:58:55 -04:00
Yuchen Wang
a65fb97aec
CC-2986: Long show description causes Add Show or Edit Show to fail silently
...
Added StringLength validators for the UI fields. This way when user gave more than what
they should gave as the input, it's going to display an error msg.
The maximum length for the fields is queried from the database before the
fields were initialized.
2011-10-24 13:27:53 -04:00
Yuchen Wang
6d15308e1d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-10-24 12:06:18 -04:00
Yuchen Wang
4db6636b06
CC-2646: Set a calendar view default (Day/week/month) that's remembered
...
1. If the preference is not user-specific, or if id is null, set subjid to null
2. Rewrote the code for the setValue logic, added comments. Should be easier
to read and understand
2011-10-24 12:05:55 -04:00
James
f2bf92297a
CC-2745: Show status of liquidsoap/icecast connection on Stream Settings page
...
- fixed a case where it was displaying "OK" when liquidsoap was not running
2011-10-23 06:29:06 -04:00
James
fb8735588d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-10-22 11:34:43 -04:00
James
f160ded6bc
CC-2993: Playlist Builder: add "View on SoundCloud" option on the menu
...
- fixed
- extra fix: handles the case when username or password is empty
2011-10-22 11:34:04 -04:00
Yuchen Wang
d9186a3bf2
CC-2951: Allow users to select the starting day of the week
...
Added system preference in Preference page for user to select the start day of a week
(defaults to Sunday).
Calendar will utilize this information and update the calendar UI accordingly.
2011-10-19 12:42:22 -04:00
Yuchen Wang
d2fe46baf0
CC-2436: Save pulldown settings
...
For week and day views under Calendar page, save the change to pref db table when
user updates the interval dropdown. Same thing goes for the "show XXX entries"
dropdown found under Playlist Builder page.
When visiting these pages, we retrieves the entry from database for current user
and use those values. Defaults to 30m for interval and 10 entries for "show xxx entries"
if values were never set.
2011-10-18 10:10:35 -04:00
Martin Konecny
959a239118
Merge branch '1.9.1' into devel
2011-10-17 13:36:40 +02:00
Martin Konecny
7548abc1b1
-fix undefined function error
2011-10-17 13:36:16 +02:00
Yuchen Wang
8b2a23b88a
CC2646: Set a calendar view default (Day/week/month) that's remembered
...
Updated the calendar page so that when user chooses a different time scale to display(day/week/month),
the new setting is stored in the pref database. Each user id has its own entry in the database.
When visiting the calendar, we retrieves the entry from database for current user
and show that time scale; defaults to monthly view if no entry found.
2011-10-14 14:17:06 -04:00
Martin Konecny
5a83c5b81e
Merge branch '1.9.1' into devel
...
Conflicts:
airtime_mvc/application/controllers/ScheduleController.php
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/models/StoredFile.php
2011-10-14 01:38:52 +02:00
Martin Konecny
d8bcb3f03d
CC-2972: Find better way to determine domain which pypo should download from.
...
-Done
2011-10-14 00:07:53 +02:00
james
faba5aec57
CC-2745: Show status of liquidsoap/icecast connection on
...
Stream Settings page
- commit w/o design
2011-10-13 14:22:28 -04:00
James
20e9002310
CC-2956: Undefined variable: endDateTime in
...
/usr/share/airtime/application/models/Show.php on line 807,
referer: http://localhost/Schedule
- fixed
2011-10-11 16:36:01 -04:00
James
efbd2f53d0
CC-2745: Show status of liquidsoap/icecast connection on Stream
...
Settings page
- temp commit
2011-10-11 14:40:30 -04:00
james
d3833f9a32
CC-2745: Show status of liquidsoap/icecast connection on Stream Settings
...
page
- initial commit
2011-10-10 20:14:27 -04:00
James
04bcd47a31
CC-2936: Soundcloud: handle the case where the soundcloud server
...
is not responsive
- fixed
2011-10-05 17:48:25 -04:00
James
c35f77a9aa
CC-2932: Recorder: When show is recorded, the file name is generated
...
with UTC time.
- fixed
- new pybundle is created with 'pytz' package
2011-10-05 17:27:00 -04:00
James
3f495e7532
CC-2795: Give option to set download flag of recorded shows uploaded
...
to Soundcloud by default
- changed function name
- changed database flag name
2011-10-04 17:38:21 -04:00
martin
7dd14efe27
CC-2750: Ability to query health status for pypo,
...
liquidsoap, media monitor, and recorder
2011-10-04 15:49:02 -04:00
martin
d54066fca8
-undo weird automerge by git.
2011-10-04 14:11:20 -04:00
martin
5190a0c24c
Merge branch '1.9.1' into devel
...
Conflicts:
airtime_mvc/application/controllers/ApiController.php
airtime_mvc/application/models/MusicDir.php
python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py
2011-10-04 13:59:27 -04:00
James
b4d4c54c31
CC-2795: Give option to set download flag of recorded shows uploaded
...
to Soundcloud by default
- fixed name of Soundcloud Model class
2011-10-03 18:02:01 -04:00
James
3ac50b0183
CC-2904: Space missing between two boxes on "Playlist Builder"
...
- fixed
- extra change: bug on flag name change
2011-10-03 15:25:55 -04:00
James
83e8a610df
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-10-03 14:13:15 -04:00
martin
1bdcff1119
CC-2750: Ability to query health status for pypo,
...
liquidsoap, media monitor, and recorder
-renamed CcComponent to CcServiceRegister
2011-09-30 14:08:15 -04:00
Paul Baranowski
44481d2776
SAAS-41: Changed name of boolean value from disable-stream-conf to
...
enable-stream-conf for easier logic.
2011-09-29 18:11:22 -04:00
James
7e3d25eeaa
CC-2795: Give option to set download flag of recorded shows
...
uploaded to Soundcloud by default
- done
2011-09-29 17:10:17 -04:00
James
bf15b4cf0d
Merge branch '1.9.1' of dev.sourcefabric.org:airtime into 1.9.1
2011-09-29 15:22:40 -04:00
James
3775e5f4a7
CC-2882: Airtime cannot delete watched folder when is been renamed
...
- done
2011-09-29 15:02:34 -04:00
James
46146d1216
cc-2882: Airtime cannot delete watched folder when is been renamed
...
- initial commit
Conflicts:
airtime_mvc/application/models/MusicDir.php
2011-09-29 15:02:30 -04:00
James
89a4c2e1e3
- Changing -3 to PHP constant
2011-09-29 14:47:07 -04:00
James
28f1d885f2
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-09-28 13:46:10 -04:00
James
d1542b0d89
CC-2882: Airtime cannot delete watched folder when is been renamed
...
- done
2011-09-28 13:45:21 -04:00
martin
3dbedc3a56
CC-2724: Play Stream Icon + jPlayer popup styling
...
-#of streams and stream bitrates now fetched from database.
2011-09-27 15:26:40 -04:00
James
b1fa8901ca
cc-2882: Airtime cannot delete watched folder when is been renamed
...
- initial commit
2011-09-27 14:49:03 -04:00
martin
685cc87951
CC-2833: Use ClassLoaders for PHP Files
...
-temporarily reenable some files from being always loaded
2011-09-26 15:32:56 -04:00
martin
9e6a1ebf44
CC-2833: Use ClassLoaders for PHP Files
...
-autoload DateHelper class
2011-09-26 15:29:12 -04:00
martin
b8838a5bda
CC-2833: Use ClassLoaders for PHP Files
...
-autoload AtSoundcloud class
2011-09-26 15:25:03 -04:00
martin
dfe43c98bb
CC-2833: Use ClassLoaders for PHP Files
...
-autoload RabbitMq class
2011-09-26 15:19:23 -04:00
martin
5cc7de95ee
CC-2833: Use ClassLoaders for PHP Files
...
-Done for class User
2011-09-23 17:00:55 -04:00
martin
1e9a8a28fe
CC-2833: Use ClassLoaders for PHP Files
...
-Done for class Schedule and ScheduleGroup
2011-09-23 16:50:00 -04:00
martin
cd95170b06
CC-2807: Remove AIRTIME_VERSION from constants.php and use the value in the database instead
...
-done
2011-09-23 16:26:19 -04:00
martin
e60db9e031
CC-2860: When recording a show, UTC time is displayed on the
...
text field of right progress bar.
2011-09-23 15:37:45 -04:00
martin
1dd78d0584
CC-2833: Use ClassLoaders for PHP Files
...
-Found out ClassLoaders only want one class per file. Moved
ShowInstance class to its own .php file.
-Merged Show_DAL class into Show class
2011-09-23 12:33:28 -04:00
martin
693c72c396
-change Shows.php to Show.php
2011-09-23 10:56:12 -04:00
martin
9bb901945e
CC-2833: Use ClassLoaders for PHP Files
...
-shows.php
2011-09-23 10:54:20 -04:00
martin
7bb9e92ac9
cc-2864: upgrade from 1.7 broken
...
-fixed
2011-09-22 17:30:05 -04:00
Paul Baranowski
48b08893f0
CC-2306: Uploading a file that already exist error message does not have styling
...
Tweaked message to the user.
2011-09-22 15:31:21 -04:00
James
965a649d0e
CC-2591: Change function name
...
- done
- extra fix: fix was needed due to class name change
2011-09-22 14:01:05 -04:00
martin
c84690adaa
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/application/controllers/LibraryController.php
2011-09-22 12:25:30 -04:00
martin
2be0960ed5
CC-2833: Use ClassLoaders for PHP Files
...
-made MusicDir, Playlist and StoredFile autoload
2011-09-22 12:24:17 -04:00
James
b3654c62bc
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-09-22 11:48:07 -04:00
James
73dc4b851d
CC-2591: Allow upload of any audio clip to Soundcloud
...
- done
- need more styling
- note there were changes in style.css
2011-09-22 11:47:24 -04:00
martin
046f98db8f
CC-2363: Diagnostic screen in Web UI
...
-everything working
2011-09-22 10:45:43 -04:00
martin
19d61ad780
CC-2363: Diagnostic screen in Web UI
...
-working with ajax now!
2011-09-19 17:55:26 -04:00
martin
a11dba1469
CC-2750: Ability to query health status for pypo, liquidsoap, media monitor, and recorder
2011-09-19 15:46:15 -04:00
martin
62f0d1c7b2
Merge branch '1.9.1' into devel
2011-09-17 12:37:15 -04:00
martin
d824eb7622
CC-2837: Invalid SQL statement
...
-fixed
2011-09-17 12:36:35 -04:00
martin
9861587dec
-CC-2750: Ability to query health status for pypo, liquidsoap, media monitor, and recorder
2011-09-16 22:05:52 -04:00
martin
e1e34d297c
-CC-2750: Ability to query health status for pypo, liquidsoap,
...
media monitor, and recorder
2011-09-16 21:30:50 -04:00
martin
3485b5a39f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-09-16 17:53:37 -04:00
martin
659e412eb7
CC-2750: Ability to query health status for pypo, liquidsoap, media monitor, and recorder
...
-progress being made
2011-09-16 17:51:28 -04:00
James
7c94734277
CC-2810: More chmnod fixes for scripts
...
- removed shebang from .py files
- removed cron folder and its content as we don't use them
- .js files are from 3rd party(datatable) so we should leave them as they are
2011-09-16 14:01:23 -04:00
martin
583a5faf72
CC-2750: Ability to query health status for pypo, liquidsoap,
...
media monitor, and recorder
2011-09-13 18:43:16 -04:00
martin
9fc2932be6
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-09-13 14:56:48 -04:00
martin
2c2bb86698
CC-2750: Ability to query health status for pypo,
...
liquidsoap, media monitor, and recorder
-fixed rabbitmq not delivering messages
2011-09-13 14:56:24 -04:00
James
f25304bcb7
CC-2789: Prevent brue-force password guessing attacks
...
- add recaptcha on login page
2011-09-13 14:16:16 -04:00
martin
0546633ac7
CC-2750:Ability to query health status for pypo, liquidsoap, media monitor, and recorder
2011-09-12 17:15:46 -04:00
martin
9c7bab616d
Merge branch '1.9.1' into devel
...
Conflicts:
VERSION
airtime_mvc/application/configs/constants.php
airtime_mvc/application/controllers/ScheduleController.php
install_minimal/airtime-install
install_minimal/include/AirtimeInstall.php
install_minimal/include/airtime-upgrade.php
python_apps/api_clients/api_client.py
python_apps/pypo/pypofetch.py
python_apps/pypo/pypopush.py
2011-09-09 15:07:43 -04:00
martin
8b09f82aa3
-when returning a file url for download, use the server address
...
that the server was contacted with.
2011-09-09 11:45:19 -04:00
james
b73016550b
CC-2265: Date Start is not updated after dragging show to new day
...
- fixed
2011-09-07 17:30:25 -04:00
James
fa929d45a6
CC-2753: Ability to disable stream 1 but still show it in the interface
...
- interface change
- all elements becomes 'disabled' depending on 'disable_stream_conf' flag
2011-09-02 16:13:30 -04:00
James
903c3474c7
CC-2654: Remove abilities that don't apply to SaaS
...
- not displaying manage folder option when saas is true
- not displaying record and rebroadcast section when saas is true
2011-09-02 15:24:35 -04:00
James
78ffa74bab
CC-2755: trial ending date
...
- add functions in Preference.php
2011-09-02 11:30:47 -04:00
James
c6557e1280
CC-2756: Ability to set plan level
...
- created setter and getter in Preference.php for plan level
- renamed airtime-stream to airtime-system
- airtime-system is removed from this repository(moved to airtime-saas)
2011-09-02 10:37:15 -04:00
James
39b688c256
CC-2661: Uptrade script for stream config feature
...
- codes for conserving user's liquidsoap.cfg and porting into new stream
setting config.
- extra fix: fixed a bug with shoutcast(default value has to be set for
some variables)
2011-09-01 16:02:06 -04:00
James
ed5b7bca5f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-08-31 16:28:40 -04:00
James
0a85d2ecf5
CC-2727: Limit number of streams and max bitrate
...
- renamed
SetNumOfStream() -> SetNumOfStreams()
GetNumOfStream() -> GetNumOfStreams() \
- default bitrate is 320
- removed debugging code
2011-08-31 16:28:20 -04:00
martin
0517bf0c82
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-08-31 15:14:44 -04:00
martin
5f56538bff
CC-2363: Diagnostic screen in Web UI
...
-show hard drive space for /srv/airtime/stor
2011-08-31 12:52:12 -04:00
martin
03cb154bd1
CC-2737: Show disk space used/space available/ disk quota enforcement
...
-modify airtime-check-system to return values instead of printing
them directly
-add ability to view select airtime-check-system via web interface
2011-08-30 18:00:03 -04:00
James
cdd1da3963
CC-2740: Upload issue
...
- fixed a bug for uploading a file with "+" signs in IE
2011-08-30 15:35:03 -04:00