Commit Graph

13103 Commits

Author SHA1 Message Date
drigato 435c49da98 Changed PYPO's download URL scheme from https to http 2014-12-08 13:57:28 -05:00
drigato 70c6801a6c Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas 2014-12-08 13:51:15 -05:00
drigato 59ceb11f00 SAAS-510: PYPO -> Files are downloaded even if they already exist in tmp cache dir 2014-12-08 13:21:24 -05:00
localizer cceddd57d8 updated translation resources 2014-12-05 10:33:17 +00:00
drigato 80af25fdf4 Undoing last commit 2014-12-03 18:07:24 -05:00
drigato 963207e26f Trying the PYPO download URL without ssl 2014-12-03 18:01:08 -05:00
drigato 024150f023 SAAS-503: PYPO -> Use the REST API to download files
Fixed disabling  SSL verication
2014-12-03 14:50:58 -05:00
drigato 2ae45bd005 Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas 2014-12-03 14:42:10 -05:00
drigato 53624d8d28 SAAS-503: PYPO -> Use the REST API to download filesSAAS-503
Added python library - requests - to pybundle
2014-12-03 14:41:16 -05:00
drigato a1062e951f SAAS-503: PYPO -> Use the REST API to download files
Change download URL to use https
2014-12-03 14:03:21 -05:00
drigato cf9eabbc74 Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/modules/rest/controllers/MediaController.php
	airtime_mvc/build/sql/schema.sql
	python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
2014-12-03 13:35:32 -05:00
drigato 16dc286420 SAAS-503: PYPO -> Use the REST API to download files 2014-12-03 13:22:52 -05:00
drigato e1f1807f5a SAAS-503: PYPO -> Use the REST API to download files
Removed Amazon S3 specific code
2014-12-02 18:46:17 -05:00
drigato bf91677f91 SAAS-505: Extract Amazon_S3 class and have it inherit from a general 'cloud backend' class
Fixed reading credentials in from cloud_storage.conf
2014-12-02 09:06:28 -05:00
drigato 7c0a25be7f SAAS-505: Extract Amazon_S3 class and have it inherit from a general 'cloud backend' class 2014-12-01 21:05:46 -05:00
drigato 432245b18e SAAS-502: Analyzer -> Set the station id and domain in the cloud object's metadata
Set the domain name in the cloud object's metadata
2014-11-27 16:54:22 -05:00
drigato 92feacd46f SAAS-501: Re-jig cloud_storage.conf 2014-11-27 15:50:40 -05:00
drigato 8601452c71 Merge conflict 2014-11-27 15:46:39 -05:00
drigato 2f9382679a Merge branch 'cc-5709-airtime-analyzer-cloud-storage' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-cloud-storage 2014-11-27 15:45:26 -05:00
drigato 6cb993cc80 SAAS-504: Store provider in db 2014-11-27 15:44:53 -05:00
drigato e59cd11370 Close the session when a track is previewed or downloaded.
Close the file pointer when we are down with it.
2014-11-27 13:48:34 -05:00
localizer 37e358630d updated translation resources 2014-11-27 14:57:16 +00:00
Albert Santoni 670a63df87 Error handling for if propel isn't found / composer wasn't run 2014-11-26 18:04:46 -05:00
Albert Santoni 8fbe7dd649 Report an error and die if amazon.conf is missing 2014-11-26 17:50:59 -05:00
drigato eef6237b42 Fix installer 2014-11-26 17:41:04 -05:00
drigato 477ac337e5 Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas
Conflicts:
	airtime_mvc/application/models/StoredFile.php
	python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
2014-11-26 11:54:07 -05:00
drigato 884a4c493d Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
Conflicts:
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/application/modules/rest/controllers/MediaController.php
	python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
2014-11-26 11:42:40 -05:00
drigato f08535cc10 Merge branch '2.5.x' into cc-5709-airtime-analyzer
Conflicts:
	airtime_mvc/application/Bootstrap.php
2014-11-26 10:35:48 -05:00
drigato bec62ec906 SAAS-496: Create a provisioning controller with a terminate endpoint 2014-11-25 16:04:08 -05:00
Albert Santoni b037bfdf97 Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2014-11-24 13:20:03 -05:00
Albert Santoni 3d0d148169 Fix race condition in selenium tests 2014-11-24 10:44:36 -05:00
Albert Santoni a62e98beb4 Fix logins from WHMCS by disabling CSRF token on login page for trusted
origins
2014-11-20 19:33:11 -05:00
drigato df933b57f7 Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas 2014-11-20 17:12:52 -05:00
drigato 544767a775 Merge branch 'cc-5709-airtime-analyzer-cloud-storage' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-cloud-storage 2014-11-20 17:11:50 -05:00
drigato 8e8fe2d288 SAAS-489: Cannot preview tracks stored on disk 2014-11-20 17:11:23 -05:00
Albert Santoni ca7d0688e7 Merge branch 'cc-5709-airtime-analyzer' into saas
Conflicts:
	airtime_mvc/application/modules/rest/controllers/MediaController.php
2014-11-20 16:47:35 -05:00
Albert Santoni 7db571d103 Remove clearAction from the media REST API for security 2014-11-20 16:47:02 -05:00
Albert Santoni 8ffd70781b Remove clearAction from the media REST API for security 2014-11-20 16:46:21 -05:00
Albert Santoni 29fd728d7d Undo live stream auth action breakage 2014-11-20 14:30:42 -05:00
Albert Santoni 0890de4cdd Merge branch 'saas' of github.com:sourcefabric/Airtime into saas 2014-11-20 14:00:12 -05:00
Albert Santoni cea3fc5302 Temporarily fix live stream auth (show source) 2014-11-20 13:59:59 -05:00
drigato 00fbda193e Schedule->removeItems optimization fix for deleting the current playing track 2014-11-20 09:57:37 -05:00
drigato 767562922a Schedule->removeItems optimization fix for deleting the current playing track 2014-11-19 17:09:54 -05:00
drigato 766c827094 Removed undefined index from show info array 2014-11-19 16:04:06 -05:00
drigato 48ae8ac69c Scheduler->removeItems optimization 2014-11-19 15:13:33 -05:00
drigato 5fdca78041 Scheduler->removeItems optimization 2014-11-19 14:30:18 -05:00
Albert Santoni 9087db2043 Removed base URL from saas Selenium tests and added missing Account
Plans tests
2014-11-19 11:30:32 -05:00
Albert Santoni 3bf68bdbe6 Merge branch '2.5.x' into saas 2014-11-19 11:29:34 -05:00
Albert Santoni 12550112fd Remove base URL from selenium tests to make the Selenium IDE happy 2014-11-19 11:28:03 -05:00
Albert Santoni 755df62a00 Merge branch 'cc-5709-airtime-analyzer' into saas
Conflicts:
	airtime_mvc/application/models/StoredFile.php
2014-11-18 18:18:44 -05:00