Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,411 Commits 3 Branches 0 Tags 405 MiB
Commit Graph

13411 Commits

Author SHA1 Message Date
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
Denise Rigato 0d790213e3 Merge pull request 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
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
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
Albert Santoni 0144fd2a84 Merge branch 'saas-media-refactor' of github.com:sourcefabric/Airtime into saas-media-refactor 2015-03-02 16:27:47 -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
Albert Santoni 76141b38b8 Merge branch 'saas' into saas-media-refactor 2015-03-02 09:52:05 -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
Albert Santoni 2e2f1f9762 Fixed SAAS-612: Recreating a station can wipe its database 2015-02-26 17:14:46 -05:00
Albert Santoni ac3ad3d23b Prevent overwriting the database if it already exists 2015-02-26 15:33:35 -05:00
Albert Santoni f1a311dad6 Merge branch 'saas' into saas-media-refactor 
Conflicts:
	airtime_mvc/application/modules/rest/controllers/MediaController.php
 2015-02-26 14:26:33 -05:00
Albert Santoni 6047670dbd Fix corner case where failed uploads could show up in the library 2015-02-26 14:12:51 -05:00
Albert Santoni 0b1af01822 Better exception logging and small pypo exception fix 2015-02-26 13:52:51 -05:00
Duncan Sommerville 016c89ea96 Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas 2015-02-26 13:35:51 -05:00
Duncan Sommerville c57d4e3fc4 Check if station is on a trial plan before displaying the trial box 2015-02-26 13:30:35 -05:00
Albert Santoni ab6d83f49d Merge branch 'saas' into saas-media-refactor 
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/modules/rest/controllers/MediaController.php
 2015-02-26 13:10:13 -05:00
Albert Santoni e099d1867f Merge branch 'saas' of github.com:sourcefabric/Airtime into saas 2015-02-26 13:06:49 -05:00
Albert Santoni d82f461f35 Fix missing filesize and md5 for WAVE imports 2015-02-26 13:06:29 -05:00
Duncan Sommerville 93f62eaadd Added check to hide LiveChat for existing hobbyist users 2015-02-26 12:49:52 -05:00
Albert Santoni edd07c18ae Fixed invalid detection of S3 backend in analyzer 2015-02-26 12:02:02 -05:00
Albert Santoni bfd6ef72b1 Fixed download URLs for non-cloud files 2015-02-26 11:29:08 -05:00
Albert Santoni 3885abbdb8 Fixed webstream previewing 2015-02-26 11:09:43 -05:00
Albert Santoni 7d534d1cda Airtime Pro SSL compatibility hack 2015-02-25 16:19:01 -05:00
drigato 48b4e3fb62 Also need to diable disk usage in media controller 2015-02-25 16:11:52 -05:00
Albert Santoni 5acad059de Insert leading slash into basedir for station URL 2015-02-25 16:09:08 -05:00
Albert Santoni 1ad024ca8d Merge branch 'cc-5709-airtime-analyzer' into saas-media-refactor 2015-02-25 16:06:27 -05:00
drigato 7e167e5a47 Temporarily disabling disk quota limit until all file sizes have been set 2015-02-25 15:28:48 -05:00
drigato e0a050ac60 Fix file deletion bug 2015-02-25 15:09:02 -05:00
Albert Santoni 3a1141d4c8 Merge branch 'saas' into saas-media-refactor 
Conflicts:
	airtime_mvc/application/cloud_storage/ProxyStorageBackend.php
	airtime_mvc/application/controllers/ApiController.php
 2015-02-25 13:02:11 -05:00