Commit Graph

13836 Commits

Author SHA1 Message Date
drigato fdd8cdfaea Fixed Airtime badge spacing 2015-04-02 14:35:13 -04:00
drigato 06f43ef2d7 CSS modifications
Added fixed width and height to player.
Floated Airtime badge to the right
2015-04-02 12:45:05 -04:00
Albert Santoni 3e2cd54be7 Fixed double sending of headers problem with S3 cache 2015-04-01 17:29:21 -04:00
Albert Santoni 9b85fc59a6 Another attempt at squashing header() warning 2015-04-01 16:29:59 -04:00
Albert Santoni 69b03cdefa Three small bugfixes
* Remove files from the database even if they couldn't be removed from disk. (log a warning)
* Return a better error message if the user attempts to delete a scheduled file
* Attempt to squash headers already sent warning during buffer flushing
  in FileIO.php
2015-04-01 16:16:46 -04:00
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 0bffa07ed9 SAAS-669: Long station names overlap with link to airtime.pro 2015-04-01 12:59:31 -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 dab9cc775c Hide the show form after updating a show because it was broken at that point anyways 2015-03-31 15:39:06 -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 ae02fe7816 Log traceback in analyzer status_reporter.py exception handler 2015-03-30 13:21:26 -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
duncan 3fe1a46c41 Fixed dropdown menus not behaving correctly 2015-03-26 12:50:53 -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
Duncan Sommerville 47f7ad2e98 Fix to upgrade path 2015-03-25 12:03:01 -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 2f4f4b05b9 Squash warning in php-amqplib 2015-03-24 16:54:09 -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
drigato 5c4533d785 SAAS-644: Embed Player -> Update embed src code and preview when an option changes 2015-03-23 10:11:33 -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 0764ca60e6 Delete muses skin files 2015-03-20 09:09:09 -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