Commit graph

4421 commits

Author SHA1 Message Date
Albert Santoni
f0bad70cee Merge branch '2.5.x' into saas-pullreq77
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/ApiController.php
2015-01-09 13:10:54 -05:00
Mark Lewis
17a577fbbb use is_numeric instead of is_int as values are strings 2015-01-09 13:02:25 -05:00
Mark Lewis
1b03bd7fbd use new var instaead of calling getShowListContent again 2015-01-09 13:02:25 -05:00
Mark Lewis
fc8e65944e added error checked for required params 2015-01-09 13:02:25 -05:00
Mark Lewis
1cc1f8a378 return error for missing instance_id on show-tracks action 2015-01-09 13:02:25 -05:00
Mark Lewis
174cf79d84 clean up shows endpoint, remove dependency on Show model 2015-01-09 13:02:25 -05:00
Mark Lewis
a27ca2f583 cleanup new HTTP apiendpoints, added HTTPHelper and getStartEndFromRequest and updated all controllers that called their own versions of this function 2015-01-09 13:02:25 -05:00
Mark Lewis
03dae5be2b fix spacing in ApiController 2015-01-09 13:01:43 -05:00
Mark Lewis
44b4faf6d9 added shows, show-schedules, show-preview, show-history-feed, item-history-feed endpoints to the HTTP api to be used via NewscoopAirtimePlugin 2015-01-09 13:01:42 -05:00
Albert Santoni
8d56e9e1ff Merge branch '2.5.x' into saas 2015-01-09 10:44:47 -05:00
Albert Santoni
05c9e21e48 Recognize audio/aac as a MIME type for webstreams 2015-01-09 10:44:24 -05:00
drigato
08738cf391 Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
Conflicts:
	python_apps/airtime_analyzer/airtime_analyzer/cloud_storage_uploader.py
2015-01-06 15:46:20 -05:00
drigato
8d914bcd13 SAAS-529: Replace Apache Libcloud with Python-Boto SDK 2015-01-06 15:44:34 -05:00
drigato
6ee97d9c53 Upgrade sql was missing the storage_backend column 2014-12-18 18:55:37 -05:00
drigato
19e6f1a535 SAAS-526: Change prefix from station name to station id
Done.
2014-12-17 16:48:20 -05:00
Albert Santoni
a0f5e33855 Added "Help Center" link to Help menu for Josh 2014-12-17 16:10:04 -05:00
drigato
b094e59df3 SAAS-526: Change prefix from station name to station id
Just seeing if we can get the hosting id from a function in the Billing Controller
2014-12-17 15:39:18 -05:00
drigato
ec1c8669c8 Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas 2014-12-17 14:14:03 -05:00
drigato
cdabbc6648 SAAS-527: Allow files to be uploaded to either the cloud or on local file storage
Done.
2014-12-17 13:11:11 -05:00
drigato
6e2f07f875 Merge branch 'cc-5709-airtime-analyzer-cloud-storage' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-cloud-storage 2014-12-16 18:47:55 -05:00
drigato
1de326283e SAAS-527: Allow files to be uploaded to either the cloud or on local file storage
Not quite done.
2014-12-16 18:47:42 -05:00
Albert Santoni
7059820ca0 Add a comment about the proxy pattern 2014-12-16 14:54:53 -05:00
drigato
ff0a685243 Updated propel models 2014-12-16 14:20:28 -05:00
drigato
ab4ebb2969 SAAS-525: Station Termination -> Delete cloud_file table records
Deleted cloud_file records.
Renamed the function that does this.
2014-12-16 14:13:57 -05:00
drigato
09c30bde1b Regenerated Propel models because some fields and methods were missing. 2014-12-16 10:53:39 -05:00
drigato
2af14e099b SAAS-519: webstreams not being deleted 2014-12-15 12:49:13 -05:00
Albert Santoni
797bafa453 Make the LiveChat changes from yesterday slightly more reslient to
missing database keys.
2014-12-12 11:57:16 -05:00
Albert Santoni
ad56d6cafb Show the plan and station URL in Live Chat 2014-12-11 17:40:34 -05:00
drigato
891cfdb48e SAAS-517: Create Provisioning controller with a terminate endpoint 2014-12-11 13:35:34 -05:00
drigato
008ffa025a SAAS-517: Create Provisioning controller with a terminate endpoint
Not quite done but getting there
2014-12-10 17:04:14 -05:00
drigato
57868d2351 Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas 2014-12-10 12:47:22 -05:00
drigato
d73b331376 SAAS-515: Prefix object names with station name 2014-12-10 12:40:08 -05:00
drigato
644e6b00d8 SAAS-516: Replace Zend_Service_Amazon_S3 with AWS SDK for PHP 2014-12-09 17:58:36 -05:00
drigato
89925e52ed Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
Conflicts:
	python_apps/pypo/pypofile.py
2014-12-08 15:34:30 -05:00
drigato
ec189fc27a SAAS-509: PYPO can't download files via the REST API 2014-12-08 15:33:02 -05:00
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
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
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
Albert Santoni
183fa7b3a3 Bind CURL calls to WHMCS to ipv4 adapter because WHMCS IP whitelist
doesn't support IPv6

* Fixes WHMCS login for all airtime.pro users
2014-12-01 16:10:03 -05:00
Albert Santoni
94d9577539 Temporarily disable the Google Tag Manager generation for debugging 2014-12-01 11:34:47 -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