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

13589 Commits

Author SHA1 Message Date
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
Denise Rigato 90196a572f Merge pull request #107 from sourcefabric/saas-enable-disk-quota 
SAAS-606: Enable disk quota on Airtime Pro
 2015-03-11 14:15:56 -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 7744e6b656 Delete player css file for now 2015-03-10 16:34:06 -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
Albert Santoni 6232e3f4f0 Better backwards compatibility fix for 4 streams 2015-03-10 12:52:00 -04:00
Albert Santoni 968b739bf4 Make 4th stream backwards compatible with the autogenerated 
liquidsoap.cfg
 2015-03-10 12:41:45 -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
localizer c8ccd38075 updated translation resources 2015-03-05 10:03:16 +00: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 d61b75f105 Added a working 4th stream 2015-03-03 16:08:53 -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
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 0805e734ef Merge branch '2.5.x-albertenhancements' into 2.5.x 2015-03-02 15:12:00 -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