Commit graph

4787 commits

Author SHA1 Message Date
Albert Santoni
7fd58ac51b Merge branch 'saas-s3proxy' into saas 2015-04-01 13:49:47 -04:00
drigato
353bfe86a5 Addded default for mobile stream setting 2015-04-01 13:05:08 -04:00
drigato
eaeed9be77 SAAS-669: Long station names overlap with link to airtime.pro 2015-04-01 12:50:49 -04:00
drigato
c1038cd92f SAAS-706: Remove volume bar from player 2015-04-01 11:25:58 -04:00
drigato
57cd2eda13 bad merge 2015-03-31 18:21:25 -04:00
drigato
220f21ab22 Merge branch 'saas' into saas-embed-player
Conflicts:
	airtime_mvc/application/configs/ACL.php
2015-03-31 17:44:14 -04:00
drigato
15a8e3fa1f Moved html5 error listener to MusesPlayer constructor 2015-03-31 17:20:42 -04:00
drigato
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
Albert Santoni
79d2ae12fb Added 2.5.12 upgrader and increased show/show instance description field
length
2015-03-31 12:38:42 -04:00
Albert Santoni
d31de0937f Refactored file storage code slightly to allow multiple download URLs 2015-03-30 11:31:07 -04:00
drigato
d0f7f820a7 SAAS-675: Implement "auto" mode 2015-03-27 16:34:04 -04:00
Albert Santoni
271dc266fa S3 proxy cache support + 1 minor analyzer bugfix 2015-03-26 12:08:52 -04:00
Duncan Sommerville
775635cdc7 Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas 2015-03-25 17:36:05 -04:00
Duncan Sommerville
669d980565 Fixed conf.php 2015-03-25 17:35:43 -04:00
Albert Santoni
b1c00932c6 Merge branch 'saas' of github.com:sourcefabric/Airtime into saas 2015-03-25 17:34:59 -04:00
Albert Santoni
58624ec100 Try to silence another permissions error problem 2015-03-25 17:34:38 -04:00
Duncan Sommerville
040eb1443d CSS fixes to make page header more responsive 2015-03-25 17:29:28 -04:00
drigato
3d2b189dba removed logging statement 2015-03-25 11:47:23 -04:00
drigato
17358a761f SAAS-663: Integrate player design 2015-03-25 11:44:28 -04:00
Albert Santoni
99d16444d2 Squash unlink warning in CcFiles.php 2015-03-25 10:51:51 -04:00
Albert Santoni
48b4eaacd6 Squashed ob_end_flush(): failed to delete and flush buffer warning 2015-03-24 17:02:04 -04:00
Albert Santoni
25d6ecac0e Disabled broken maintenance screen code to squash warnings on upgrade 2015-03-24 16:54:57 -04:00
Albert Santoni
d1b28fd564 Fixed a bug in FTP upload hook, other minor improvements
* Ensure we have write permissions on any newly uploaded files by FTP
* Don't silence warnings in moveFileToStor()
* Reduced the FTP upload max retry count
* Log E_NOTICE and E_WARNING levels to Sentry
2015-03-24 14:56:03 -04:00
Albert Santoni
bc2acaea51 Don't fire conversion tracking for the sourcefabric_admin user 2015-03-24 11:18:03 -04:00
Albert Santoni
084c6dd662 PHP compatibility fix 2015-03-24 10:34:48 -04:00
Albert Santoni
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
drigato
e32744668f SAAS-661: Add mobile stream identifier on Stream Settings page 2015-03-23 16:06:35 -04:00
drigato
e2ca218ac2 Merge remote-tracking branch 'stash/saas-four-streams' into saas-embed-player 2015-03-23 15:54:04 -04:00
drigato
5a373ac604 Merge branch 'saas' into saas-embed-player 2015-03-23 15:46:03 -04:00
drigato
2ae4d6c1c3 Embed Player
Added stream modes
Unhardcoded some values
Disabled opus streams
2015-03-23 12:37:22 -04:00
Albert Santoni
7b9efb988f Fixed logic error Amazon_S3StorageBackend 2015-03-20 18:03:23 -04:00
Albert Santoni
8c7ae6c890 Added safety checks to Amazon_S3StorageBackend 2015-03-20 17:23:53 -04:00
Albert Santoni
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
Albert Santoni
ddd75cb8e3 Merge branch 'saas' of github.com:sourcefabric/Airtime into saas 2015-03-20 12:36:46 -04:00
Albert Santoni
68c4cdcab3 Added missing downgrade() function to the 2.5.11 upgrader 2015-03-20 12:36:28 -04:00
drigato
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
drigato
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
Duncan Sommerville
59206bc73b Fixed typo 2015-03-19 17:53:53 -04:00
Duncan Sommerville
2ec2403cce Moved provisioning change function into controller from helper 2015-03-19 17:32:02 -04:00
drigato
16ddf09d6d SAAS-655: Extract muses player events into our own js object 2015-03-19 16:59:05 -04:00
drigato
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
Duncan Sommerville
bd72252e9e Fixed typos 2015-03-19 12:07:02 -04:00
Duncan Sommerville
766f649f56 Merge branch 'saas-dashboard-provisioning' into saas 2015-03-19 11:59:01 -04:00
drigato
bafd9eeb6f Cleaning up player code 2015-03-18 15:03:34 -04:00
drigato
ed891fb145 Committing lots of trial and error embed player code changes 2015-03-18 14:23:38 -04:00
drigato
1f2f8a27a5 SAAS-650: Fix up player page UI in Airtime 2015-03-16 13:24:58 -04:00
drigato
dc0855de18 SAAS-643: Embed Player -> Restrict the setting of an OPUS stream 2015-03-16 11:29:24 -04:00
Albert Santoni
34de6da2c7 Major performance improvements to the Dashboard and Calendar views
* Close the PHP session for writing as early as possible in most AJAX
  calls for those views
* Reduce the number of roundtrips to the server in both the Dashboard
  and Calendar views by putting the data in our HTML response (this
  makes a massive difference)
* Eliminated a couple of unneccessary AJAX calls
* Use lazy loading in full calendar
* Fixed a bug in the week view that only occurs near the end of the
  week (date->gmdate bug!)
2015-03-13 18:22:27 -04:00
drigato
694430f542 SAAS-637: Un-hardcode all player variables 2015-03-12 15:45:53 -04:00
drigato
ac2181a52d Merge branch 'saas' into saas-embed-player 2015-03-11 17:13:04 -04:00