Martin Konecny
0fee577c67
Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x
...
Conflicts:
airtime_mvc/application/Bootstrap.php
2012-02-02 14:13:04 -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
0199f572bd
CC-3174 : showbuilder
...
dragging into timeline is working
need to replace jjmenus
2012-02-02 15:51:15 +01:00
Naomi Aro
8b93b98e24
CC-3174 : show builder
...
removing widths where unneeded.
2012-02-02 01:33:53 +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
df73726961
CC-3293: Stream settings page does not remember the stream metadata format
...
- fixed
2012-02-01 12:10:31 -05:00
James
026bdebacc
CC-3293: Stream settings page does not remember the stream metadata format
...
- fixed
2012-02-01 12:09:59 -05:00
James
81d24b7825
SAAS-174: Ability to add Google Analytics to the demo instance
...
- adding google-analytics.js
2012-02-01 11:49:53 -05:00
James
80d99f013a
SAAS-174: Ability to add Google Analytics to the demo instance
...
- adding google-analytics.js
2012-02-01 11:48:29 -05:00
James
3643c9caaf
SAAS-174: Ability to add Google Analytics to the demo instance
...
- done
2012-02-01 11:44:20 -05: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
James
8e40c95e9a
SAAS-174: Ability to add Google Analytics to the demo instance
...
- done
2012-02-01 10:57:38 -05:00
Martin Konecny
b2ed751e9e
Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x
2012-01-31 21:24:23 -05:00
Martin Konecny
7ee17ba07e
CC-3291: Airtime is missing Australia and Arctic timezones
...
-fixed
2012-01-31 21:24:01 -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
James
b644a94363
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-01-30 16:29:50 -05:00
James
80970efa9c
SAAS-174: Ability to add Google Analytics to the demo instance
...
- done
2012-01-30 16:29:35 -05:00
James
c5f3e40397
SAAS-174: Ability to add Google Analytics to the demo instance
...
- done
2012-01-30 16:28:27 -05:00
james
e05e2ea49c
CC-3284: Version the javascript directories so that upgrades
...
work correctly for clients.
- appended timestamp of last modified time on all js and css file import
Conflicts:
airtime_mvc/application/controllers/LibraryController.php
2012-01-27 15:37:53 -05:00
james
9f2d0fc8d5
CC-3284: Version the javascript directories so that upgrades
...
work correctly for clients.
- appended timestamp of last modified time on all js and css file import
2012-01-27 15:30:44 -05: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
James
5026da56cb
SAAS-178: Demo instance should prevent changing of admin password
...
- Error msg is returned when try to update admin account
2012-01-25 14:14:27 -05:00
James
192c30bacc
Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x
2012-01-25 14:12:42 -05:00
James
2027db3609
SAAS-178: Demo instance should prevent changing of admin password
...
- Error msg is returned when try to update admin account
2012-01-25 14:12:19 -05: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
James
863de54fc8
Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x
2012-01-18 10:29:19 -05:00
Yuchen Wang
93dfb253c1
CC-3239: Create show form->Date start doesnt consider "Week starts on" parameter
...
Fixed
2012-01-18 10:28:41 -05:00
Naomi Aro
cc20db5d30
Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x
2012-01-18 16:22:22 +01:00
Naomi Aro
fa872894f3
CC-3259 : change repeating state of show.
2012-01-18 16:21:46 +01:00
Paul Baranowski
07bd5dacae
Improved tooltip for Stream Settings: Icecast Vorbis Metadata
2012-01-17 16:03:41 -05:00
James
087d893a60
Merge branch 'airtime-2.0.x' into devel
2012-01-17 14:48:04 -05:00
James
3a8ba36e0d
SAAS-155: Add possibility to show additional information on
...
login page (for demo site)
- username and password are auto filled on demo site
- added informative msg on demo site about username and password
2012-01-17 14:47:26 -05:00
James
ff428d2c4f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-01-17 11:35:48 -05:00
James
dae7e73a84
CC-3250: UI design for mount monitor for media monitor
...
( Manage Media Folder and Playlist Builder screen)
- initial commit
2012-01-17 11:35:31 -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
James
c82394b7a0
CC-3246: Hardware audio output cannot be switched off
...
- fixed
2012-01-13 16:57:02 -05:00
James
ccef97190a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-01-13 16:56:29 -05:00
James
bcbbf42f62
CC-3246: Hardware audio output cannot be switched off
...
- fixed
2012-01-13 16:56:02 -05:00
Yuchen Wang
d753b0bb02
CC-3226: Record cancel dialog says "stop playback?" instead of "stop recording?"
...
Done
2012-01-13 16:46:37 -05: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
Yuchen Wang
b215d816ac
CC-3186: Design tweaks for tooltip
...
Updated the icon to make it stand out more
2012-01-13 10:28:42 -05:00
James
41b072b412
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-01-12 17:55:25 -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
James
09d50e7e25
Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x
2012-01-12 16:38:21 -05:00
James
04b592b831
CC-3245: upgrade 1.8->2.0 cause error in show recorder
...
- fixed
2012-01-12 16:36:14 -05:00
Yuchen Wang
044f511455
SAAS-141: Tweaks for trial balloon
...
Done
2012-01-12 15:47:08 -05:00
Yuchen Wang
6b7523513e
Merge branch 'group_action_playlist_builder' into devel
2012-01-12 14:28:12 -05:00
Yuchen Wang
186aa9e898
CC-1977: Allow multiple files to be selected and acted upon in the library and playlist
...
Fixed bugs introduced by backend changes from before
2012-01-12 14:27:43 -05:00
Yuchen Wang
4a372715a3
CC-3239: Create show form->Date start doesnt consider "Week starts on" parameter
...
Fixed
2012-01-12 12:19:05 -05:00
Martin Konecny
67ddda4a2d
-Remove phing path from conf.php
2012-01-12 12:16:10 -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
Martin Konecny
4f546a1bc3
CC-3238: When ICEcast is not on local host, Jplayer is not playing anything
...
-fixed with workaround to show the user what ip they're listening on.
2012-01-11 16:27:14 -05:00
Yuchen Wang
561b508162
Merge branch 'group_action_playlist_builder' into devel
2012-01-11 15:38:05 -05:00
Yuchen Wang
09df61d027
CC-1977: Allow multiple files to be selected and acted upon in the library and playlist
...
Fixed the bug where checkbox change events get handled multiple times
2012-01-11 15:36:45 -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
f3ce8e77d1
Merge branch 'group_action_playlist_builder' into devel
2012-01-11 10:42:35 -05:00
Yuchen Wang
cf045652ec
CC-1986: Configurable columns for media search
...
- Fixed some hardcoded array access
- Fix js error in ColReorder
2012-01-11 10:41:58 -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
7d9aa3ca5d
CC-2299: Better column options in playlist/file list on playlist builder
...
- allow columns to be re-ordered; note that the 1st two columns are fixed in-place to avoid some
problem with the ColVis plugin
2012-01-10 09:52:32 -05:00
Martin Konecny
6e48d6eafc
CC-3229: JavaScript files under airtime_mvc/public/js/datatables/unit_testing/tests_onhold are chmod executable
...
-fixed by removing
2012-01-09 17:57:08 -05:00
Martin Konecny
c3430e5411
-various optimizations
2012-01-09 17:47:58 -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
Yuchen Wang
a1ccb9c42a
CC-1986: Configurable columns for media search
...
- Upgraded ColVis plugin to 1.7, as this one contains some bug-fix that we need
- Added CSS file for ColVis plugin, so that we don't have to modify the plugin code
- Added the Configure Columns UI code
2012-01-08 10:33:11 -05:00
Yuchen Wang
8833f4462e
CC-1977: Allow multiple files to be selected and acted upon in the library and playlist
...
- Added checkbox column to playlist builder
- Added the ability to add multiple songs to playlist by using checkboxes and "Add" button
- Added the ability to delete multiple songs/playlists by using checkboxes and "Delete" button
- Make them look nice by adjusting CSS and datatable
2012-01-07 23:37:37 -05:00
Yuchen Wang
f025dccc4f
CC-1986: Configurable columns for media search
...
Modified dataTables.ColVis.js plugin to make it work...
2012-01-07 11:55:55 -05:00
Yuchen Wang
6597f6701a
CC-1986: Configurable columns for media search
...
Adding ColVis plugin for datatable, this plugin can be used to Show/Hide columns
2012-01-07 10:03:54 -05:00
James
61c5355e8a
cc-2977: getting close!!!
2012-01-06 15:47:11 -05:00
Yuchen Wang
1044881666
CC-3114: Show Content Dialog doesn't display total time
...
Somehow this file didn't get committed...
2012-01-05 10:30:37 -05:00
Martin Konecny
14b7fd03bb
-remove show-recorder from status page if saas enabled.
2012-01-04 18:57:28 -05:00
Yuchen Wang
722306928b
CC-3114: Show Content Dialog doesn't display total time
...
Done
2012-01-04 17:15:15 -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
Yuchen Wang
0df23305a0
CC-2237: Default fade time should be non-zero number of seconds
...
Done
2012-01-04 17:09:16 -05:00
Yuchen Wang
476484a269
CC-2985: Pop-up metadata box in Playlist Builder does not show Language field
...
Done
2012-01-04 17:08:38 -05:00
Yuchen Wang
a63d975fce
CC-2355: Repeating show should default to 'No End'
...
Done
2012-01-04 17:06:58 -05:00
Martin Konecny
e9634f94a1
Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x
2012-01-04 14:31:50 -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
james
9216da7f03
Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x
2011-12-24 11:03:02 -05:00
james
c9c6a08a1c
CC-3220: Stream Setting: Status box is stuck on waiting if nothing is
...
changed and click save
- done
- liquidsoap_update_error and liquidsoap_update_connection functions are
combined into one function, liquidsoap_update_status, in various place
- created various telnet commands in liquidsoap( connection check for each
stream, connection status for all streams)
- In liquidsoap, shoutcast stream doesn't use default id. It is more
informative by using id with "shoutcast_stream_#{stream_number}
2011-12-24 10:59:09 -05:00
Martin Konecny
f4449865cc
Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x
2011-12-22 17:21:43 -05:00
Martin Konecny
a55b47efff
-Allow etc and stor directories to be configurable
2011-12-22 17:21:18 -05:00
james
9665c970af
CC-3218: Stream-settings: Spaces and other illegal characters should not be
...
allowed in the fields: server, username, password, URL, and mount point
- adding an another mask for domain name. Front and backend
2011-12-22 15:35:46 -05:00
Naomi Aro
52b0e3c5f9
CC-3110 : Password reset
...
basic functionality password reset using sendmail
2011-12-21 16:01:29 -08:00
James
30b192a809
CC-3218: tream-settings: Spaces and other illegal characters should not
...
be allowed in the fields: server, username, password, URL, and mount point
- masking was added on the front end and validators were added for the
server side.
- extra fix: fixed php undefined index notice problem.
2011-12-21 17:30:42 -05:00
James
ac50c279f7
CC-3215: When you click on Playlist Builder, for a brief instant you see the
...
library table headings with different columns
- fixed
2011-12-20 15:00:20 -05:00
James
b4559753d7
CC-3216: Make sure "session.auto_start" is set correctly in php.ini
...
- setting session.auto_start to 0 in htaccess file
2011-12-20 12:31:03 -05:00
James
19aba4be92
CC-3213: Customer is unable to save Fade Out/Cue out for playlists
...
- the trim function was causing a issue on IE8. Maybe on othere browsers
too but it was still working on other browsers
2011-12-20 12:18:56 -05:00
James
8b37c5d4da
CC-3215: When you click on Playlist Builder, for a brief instant you see
...
the library table headings with different columns
- fixed
2011-12-20 11:32:46 -05: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
James
9048de16e2
CC-3211: When TimeTicker is open and user clicks on the calendar,
...
it resets the time value
- There was an extra white space at the end. Trim solved a problem.
2011-12-19 13:20:11 -05:00
James
a23807e0c7
CC-3211: When TimeTicker is open and user clicks on the calendar,
...
it resets the time value
- fixed
- removed some unnecessary code
2011-12-19 11:39:07 -05:00
Martin Konecny
cdcdd9227d
-add vhost support
2011-12-19 00:11:45 -05:00
Martin Konecny
8d369e662d
-make airtime.conf selectable in conf.php
2011-12-18 23:44:19 -05:00
james
17e09b64af
CC-3210 Show: Date mask does not work when you
...
"Add This Show" -> "Close" -> "+ Show"
- moved masking function to more appropriate place which also
fixed the bug
2011-12-18 22:55:03 -05:00
james
ce27632ec9
CC-3212: TimeTicker and DateTicker are both open at the same time
...
on Chrome (13v)
- turn off autoTab option
- removed unnecessary code
2011-12-18 22:42:35 -05:00
james
d97b9ad164
CC-3197: "Add/update show" usability issues
...
- done.
2011-12-16 15:36:37 -05:00
Yuchen Wang
f6670b001f
CC-3202: Airtime/Sourcefabric/GNU GPL v.3 links in Help->About should be opened in a new tab
...
Done
2011-12-14 22:29:02 -05:00
Yuchen Wang
150ea0baaf
Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x
2011-12-14 22:21:58 -05:00
Yuchen Wang
b42d217684
CC-3193: context menu "Delete This Instance and All Following" doesn't make sense when appearing on a non-repeating show
...
Show the menu item when the show is rebroadcasting.
2011-12-14 22:21:02 -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
Yuchen Wang
7542d86b94
CC-3193: context menu "Delete This Instance and All Following" doesn't make sense when appearing on a non-repeating show
...
Fixed by checking if the show is a repeating show.
2011-12-14 10:12:17 -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
3cd11c696f
CC-3184 : Preferences: "Stream Label" needs to be moved to "Stream Settings"->"Global"
2011-12-13 12:10:25 +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
lukabazuka
9f25155246
CC-3162
...
Signed-off-by: lukabazuka <vladimir.stefanovic@sourcefabric.org>
2011-12-12 21:27:58 +01:00
Naomi Aro
c887fec86b
CC-3179 : shows populated date must be timestamp.
2011-12-12 21:11:05 +01:00
Naomi Aro
85b2bf6e55
CC-3181 : re-uploaded to soundcloud creates the file name in a different format
2011-12-12 16:04:16 +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
1b8e1455d6
SAAS-101: "Buy Now" link needs to pop up a new window when you click on it
...
Done
2011-12-09 13:51:20 -05:00
Yuchen Wang
106b54b6f4
CC-3168: Stream Settings: "Vorbis Metadata" confusing string
...
href='#' is not needed, removing it
2011-12-09 13:50:55 -05:00
Yuchen Wang
c3b6203628
CC-3168: Stream Settings: "Vorbis Metadata" confusing string
...
Done
2011-12-09 13:42:03 -05:00
Yuchen Wang
e583511b21
SAAS-57: Add LiveChat to Airtime Pro
...
Didn't consider the case of client_id being an empty string,
thus making the javascript syntax invalid
2011-12-09 12:37:31 -05:00
Yuchen Wang
343cd8274d
SAAS-57: Add LiveChat to Airtime Pro
...
Forgot to remove the code from ApiController...
2011-12-09 11:25:50 -05:00
Yuchen Wang
8c018a2731
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-12-09 11:12:57 -05:00
Yuchen Wang
764d6c3347
SAAS-57: Add LiveChat to Airtime Pro
...
Create a javascript variable to hold the client_id
2011-12-09 11:12:42 -05:00
Naomi Aro
fe87a82fbc
CC-2926 : Clicking "Choose File" in support settings to upload image defaults to "Audio/MPEG" type in Chrome
2011-12-09 13:07:33 +01:00
Yuchen Wang
2d04d7eb83
SAAS-57: Add LiveChat to Airtime Pro
...
Fixing the issue of livechat showing up in the stream player pop-up
2011-12-08 18:04:32 -05: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
Yuchen Wang
c49cd436fa
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-12-08 16:46:13 -05:00
Yuchen Wang
201667936c
SAAS-57: Add LiveChat to Airtime Pro
...
Adding code to non-saas side
2011-12-08 16:45:11 -05:00
Naomi Aro
36d9b15435
CC-3150 : Editor box still open with show details for a deleted show
2011-12-08 17:49:00 +01: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
Yuchen Wang
af3b75bab4
SAAS-95: Trial Box: Change "Keep Going On" to "Buy Now"
...
Done
2011-12-05 19:50:42 -05:00
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