Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
13539 commits 3 branches 0 tags 405 MiB
Commit graph

4669 commits

Author SHA1 Message Date
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
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
Denise Rigato
052055bfff Merge pull request #106 from sourcefabric/saas-update-disk-usage-upgrader 
SAAS-628: Create script to update disk_usage for all Airtime pro station...
 2015-03-11 16:48:28 -04:00
drigato
55ed21a155 SAAS-606: Enable disk quota on Airtime Pro 2015-03-11 13:50:17 -04:00
drigato
5b3edaa2ca Add order by clause to /rest/media index action 2015-03-11 13:25:27 -04:00
Albert Santoni
0042fb50fe Refactor some stuff related to four streams, Liquidsoap is a piece of 
shit too - no dynamic variables
 2015-03-10 19:15:38 -04:00
drigato
8198d89095 small change to player form 2015-03-10 16:47:08 -04:00
drigato
6c46f0a156 Added player preview to view 
Everything is hardcoded right now
 2015-03-10 16:32:35 -04:00
Duncan Sommerville
716244011a Removed unnecessary conditional around /provisioning/change in Bootstrap 2015-03-10 13:20:11 -04:00
drigato
b398fea7e7 SAAS-628: Create script to update disk_usage for all Airtime pro stations 2015-03-10 12:29:30 -04:00
Denise Rigato
0d790213e3 Merge pull request #103 from sourcefabric/saas-paginagte-rest-media-index-action 
Saas paginagte rest media index action
 2015-03-06 14:31:06 -05:00
drigato
e315498a5c SAAS-624: Request to rest/media throws an exception if the data set is too large 
Modified /rest/media to return items where file_exists = true
 2015-03-06 12:21:51 -05:00
Albert Santoni
47e6879766 Fixed Billing.php again 2015-03-06 11:18:48 -05:00
Albert Santoni
6cecb7c239 Simplified the FTP upload hook 2015-03-06 11:06:17 -05:00
drigato
962f5d925d SAAS-624: Request to rest/media throws an exception if the data set is too large 
Fixed small typo
 2015-03-06 09:32:14 -05:00
Albert Santoni
e9adf1a7ed Merge branch 'saas-623' into saas 
Conflicts:
	airtime_mvc/application/common/Billing.php
 2015-03-05 18:23:09 -05:00
Albert Santoni
8cdecff022 Fixed Billing::GetClientInstanceId() 2015-03-05 18:22:04 -05:00
Albert Santoni
df48de607b Revert billing client ID change 2015-03-05 17:45:07 -05:00
drigato
7607888257 Merge branch 'saas' into saas-paginagte-rest-media-index-action 2015-03-05 14:27:32 -05:00
drigato
62d6849d4e SAAS-624: Request to rest/media throws an exception if the data set is too large 
Added offset and limit parameters to /rest/media index action.
 2015-03-05 14:25:48 -05:00