78b2631980
Remove stream url js escaping and do it on server side instead
2015-04-08 15:19:22 -04:00
94a7643ebc
Escape stream urls in the player js
2015-04-08 15:00:02 -04:00
23bf866211
SAAS-712: UI Improvements
2015-04-08 14:01:57 -04:00
f6d5b34cca
Embed player - code review fixes
2015-04-07 17:49:21 -04:00
481d21ff70
SAAS-662: Make player auto-connect if there is a problem with the stream
...
HTML5 error handling
2015-04-07 11:34:21 -04:00
e8c8fde8bd
Fix airtime.pro link on player
2015-04-02 15:27:01 -04:00
fdd8cdfaea
Fixed Airtime badge spacing
2015-04-02 14:35:13 -04:00
eaeed9be77
SAAS-669: Long station names overlap with link to airtime.pro
2015-04-01 12:50:49 -04:00
c1038cd92f
SAAS-706: Remove volume bar from player
2015-04-01 11:25:58 -04:00
220f21ab22
Merge branch 'saas' into saas-embed-player
...
Conflicts:
airtime_mvc/application/configs/ACL.php
2015-03-31 17:44:14 -04:00
15a8e3fa1f
Moved html5 error listener to MusesPlayer constructor
2015-03-31 17:20:42 -04:00
778df97d3c
SAAS-662: Make player auto-connect if there is a problem with the stream
...
Kind of working in HTML5 mode
2015-03-31 16:51:14 -04:00
d0f7f820a7
SAAS-675: Implement "auto" mode
2015-03-27 16:34:04 -04:00
040eb1443d
CSS fixes to make page header more responsive
2015-03-25 17:29:28 -04:00
3d2b189dba
removed logging statement
2015-03-25 11:47:23 -04:00
17358a761f
SAAS-663: Integrate player design
2015-03-25 11:44:28 -04:00
3d03f837d2
Trial->Paid conversion tracking with GTM
...
* Added trial to paid conversion tracking with GTM
* Removed WHMCS roundtrip from Showbuilder
* Moved all Analytics code into common/GoogleAnalytics.php
* Added a new Thank You page after plan changes to capture conversions
* Added a ConversionTracking plugin to facilitate that
* Also backported some minor staticBaseDir compatibility changes
* Fixed a logic error in creating the baseDir
2015-03-24 10:11:25 -04:00
e32744668f
SAAS-661: Add mobile stream identifier on Stream Settings page
2015-03-23 16:06:35 -04:00
5a373ac604
Merge branch 'saas' into saas-embed-player
2015-03-23 15:46:03 -04:00
2ae4d6c1c3
Embed Player
...
Added stream modes
Unhardcoded some values
Disabled opus streams
2015-03-23 12:37:22 -04:00
32aa962138
Fixed error logging and refactored ErrorController to get invoked
...
correctly when using API key authentication
* Along with the bugfixes, backported improved ErrorController from upstream branch,
including style improvements.
2015-03-20 17:20:34 -04:00
28786e7bf1
SAAS-655: Extract muses player events into our own js object
...
Moved player creation into musesPlayer constructor
2015-03-20 07:41:10 -04:00
20d774874e
SAAS-655: Extract muses player events into our own js object
...
Added skeleton functions for setVolume and setURL
2015-03-20 07:35:18 -04:00
16ddf09d6d
SAAS-655: Extract muses player events into our own js object
2015-03-19 16:59:05 -04:00
875ed0e41e
Got muses working without a skin
...
Had to leave the skin visible but "hide" it by setting the width and
height to 1px
2015-03-19 13:42:19 -04:00
bafd9eeb6f
Cleaning up player code
2015-03-18 15:03:34 -04:00
ed891fb145
Committing lots of trial and error embed player code changes
2015-03-18 14:23:38 -04:00
1f2f8a27a5
SAAS-650: Fix up player page UI in Airtime
2015-03-16 13:24:58 -04:00
dc0855de18
SAAS-643: Embed Player -> Restrict the setting of an OPUS stream
2015-03-16 11:29:24 -04:00
694430f542
SAAS-637: Un-hardcode all player variables
2015-03-12 15:45:53 -04:00
ac2181a52d
Merge branch 'saas' into saas-embed-player
2015-03-11 17:13:04 -04:00
6c46f0a156
Added player preview to view
...
Everything is hardcoded right now
2015-03-10 16:32:35 -04:00
936d11b367
Merge branch '2.5.x-albertenhancements' into saas
2015-02-27 17:21:20 -05:00
78c7170c4e
Reformatted logo remove button to use Zend
2015-02-27 17:19:37 -05:00
c57d4e3fc4
Check if station is on a trial plan before displaying the trial box
2015-02-26 13:30:35 -05:00
2272451e08
Added placeholders for player embed code and preview
2015-02-25 17:10:41 -05:00
cf11291877
Merge branch 'saas' into saas-embed-player
2015-02-25 12:13:41 -05:00
e13e4413ea
Merge remote-tracking branch 'origin/2.5.x-albertenhancements' into saas
2015-02-24 15:03:06 -05:00
5e256df061
Added remove button for station logo on preferences page
2015-02-24 12:12:30 -05:00
69d588d2f6
Merge branch '2.5.x' into 2.5.x-albertenhancements
2015-02-24 10:45:52 -05:00
4fd7b4c622
SAAS-585: Create Embeddable Player form
...
Added stream urls - hardcoded for now
2015-02-17 11:48:43 -05:00
56cae34259
Fix typo
2015-02-12 14:20:54 -05:00
c261182c8f
Skeleton player form/view/controller
2015-02-12 14:08:06 -05:00
dbba5a7427
Decouple Billing and S3 cloud storage stuff from Zend
2015-01-26 13:10:10 -05:00
ac8fadfc80
Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
CREDITS
airtime_mvc/application/modules/rest/controllers/MediaController.php
airtime_mvc/application/views/scripts/form/support-setting.phtml
2015-01-23 16:36:31 -05:00
ca9750f415
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/configs/ACL.php
airtime_mvc/application/controllers/ApiController.php
airtime_mvc/application/controllers/plugins/Acl_plugin.php
airtime_mvc/application/forms/GeneralPreferences.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
airtime_mvc/application/views/scripts/form/preferences_general.phtml
airtime_mvc/application/views/scripts/form/support-setting.phtml
airtime_mvc/build/sql/schema.sql
2015-01-23 11:32:45 -05:00
230cdcccb4
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
CREDITS
2015-01-22 11:29:38 -05:00
fd42c67b0b
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
2015-01-21 18:08:05 -05:00
2fadc8f8f1
Merge branch '2.5.x' into saas
...
Conflicts:
CREDITS
2015-01-20 11:44:53 -05:00
0c3395289d
Merge pull request #78 from Robbt/realtime-smart-blocks
...
Added sort tracks by upload time to smart blocks criteria
2015-01-19 15:36:28 -05:00
drigato
Duncan Sommerville
Albert Santoni
Albert Santoni