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
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
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
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
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
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
Duncan Sommerville
918631d676
When calling /change, don't set prefs if empty/no parameters are given
2015-03-05 12:24:02 -05:00
Albert Santoni
181db7617a
Use Billing::getClientInstanceId() in Amazon_S3StorageBackend
2015-03-04 17:02:30 -05:00
drigato
df28b47b92
SAAS-624: Request to rest/media throws an exception if the data set is too large
2015-03-04 16:26:35 -05:00
Albert Santoni
278aa31d2f
Hack: avoid calling WHMCS to get the station instance id
2015-03-04 15:53:43 -05:00
Duncan Sommerville
e2054c13c8
Added provisioning code for change requests
2015-03-03 16:04:45 -05:00
Duncan Sommerville
95db8533b5
Made provisioning helper slightly more robust
2015-03-03 15:29:34 -05:00
Duncan Sommerville
52813045a6
Additional parameters in provisioning when creating stations from dashboard
2015-03-03 15:10:10 -05:00
Albert Santoni
1f6f880dad
Fixed deleting failed uploads
2015-03-03 13:44:42 -05:00
Albert Santoni
8a6ee8ad14
Fixed /rest/media endpoint DELETE
2015-03-03 12:52:41 -05:00
Duncan Sommerville
6082738439
Merge branch 'saas' into saas-media-refactor
2015-03-02 16:02:34 -05:00
Duncan Sommerville
17d51eb0f9
Added csrf verification to show image upload and deletion
2015-03-02 16:00:11 -05:00
Duncan Sommerville
ccb4b1552e
Merge branch '2.5.x-albertenhancements' into saas
2015-03-02 15:26:13 -05:00
Duncan Sommerville
0272eaef44
Changed is_null to empty
2015-03-02 15:25:52 -05:00
Duncan Sommerville
a7cedbb34f
Merge branch '2.5.x-albertenhancements' into saas
2015-03-02 15:10:37 -05:00
Duncan Sommerville
b6a6f038a9
Added call to setStationDescription in preferences action
2015-03-02 15:10:04 -05:00
Duncan Sommerville
7a035e91ec
Merge branch '2.5.x-albertenhancements' into saas
2015-03-02 14:58:33 -05:00
Duncan Sommerville
13bd0b7589
Fixed removing image when saving preferences with no upload
2015-03-02 14:57:50 -05:00
Duncan Sommerville
936d11b367
Merge branch '2.5.x-albertenhancements' into saas
2015-02-27 17:21:20 -05:00
Duncan Sommerville
78c7170c4e
Reformatted logo remove button to use Zend
2015-02-27 17:19:37 -05:00