Commit Graph

983 Commits

Author SHA1 Message Date
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 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
James c5f3e40397 SAAS-174: Ability to add Google Analytics to the demo instance
- done
2012-01-30 16:28:27 -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
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
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 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
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
James c82394b7a0 CC-3246: Hardware audio output cannot be switched off
- fixed
2012-01-13 16:57:02 -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 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
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
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
Martin Konecny 14b7fd03bb -remove show-recorder from status page if saas enabled. 2012-01-04 18:57:28 -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 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
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