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

5849 Commits

Author SHA1 Message Date
drigato 8f0f69abd9 More logging 2015-01-12 15:45:33 -05:00
drigato 44b82fdd8a More logging statements 2015-01-12 15:37:48 -05:00
drigato 85557d4886 Logging statements 2015-01-12 15:29:41 -05:00
drigato 02e4c18931 SAAS-531: Finalize S3 folder hierarchy 2015-01-12 14:50:42 -05:00
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 ad16683858 Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas 2015-01-07 14:17:02 -05:00
drigato 9d6cf8620f Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage 2015-01-07 14:16:09 -05:00
drigato e5c806f658 Merge branch '2.5.x' into cc-5709-airtime-analyzer 2015-01-07 14:13:36 -05:00
Albert Santoni f08970822d Merge branch '2.5.x' into saas 2015-01-07 12:37:26 -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
localizer 59d7c23450 updated translation resources 2014-12-23 10:10:38 +00: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 d5fc90e9d3 Merge branch '2.5.x' into saas 2014-12-15 10:50:25 -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
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 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
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 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
Duncan Sommerville 86ce4673ab Merge branch '2.5.x' of https://github.com/sourcefabric/Airtime into 2.5.x 2014-11-25 12:27:50 -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
Duncan Sommerville c627342e28 Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas 2014-11-19 15:21:14 -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 755df62a00 Merge branch 'cc-5709-airtime-analyzer' into saas 
Conflicts:
	airtime_mvc/application/models/StoredFile.php
 2014-11-18 18:18:44 -05:00
Albert Santoni c829b6bf95 Fix bad merge 2014-11-18 18:17:19 -05:00
Albert Santoni dd3b54f8ed Actually delete files from the database via the media REST API 2014-11-18 18:15:45 -05:00
Albert Santoni 4f7f64af7a Merge branch 'cc-5709-airtime-analyzer' into saas 2014-11-18 17:45:08 -05:00
Albert Santoni 11a31375df Slightly more robust fix for the last issue 2014-11-18 17:41:44 -05:00
Albert Santoni 162995bb49 Merge branch 'cc-5709-airtime-analyzer' into saas 2014-11-18 17:14:01 -05:00
Duncan Sommerville 6460854fda Fixed 'clear' button not working when files failed to import 2014-11-18 17:13:48 -05:00
Albert Santoni e7e1926896 CC-5950: Fix for issue where clear button in Recent Uploads didn't work 
sometimes
 2014-11-18 17:11:09 -05:00
drigato 34453b5548 Removed setting the directory for cloud files 2014-11-18 10:57:21 -05:00
drigato 501b22c48d Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas 2014-11-18 10:32:28 -05:00
drigato 3c73abc786 SAAS-491: Edit meta data not working 
Fixed: Propel 1.7 does not cast string types to integers
 2014-11-18 10:32:03 -05:00
drigato 4d8b32556b Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas 
Conflicts:
	airtime_mvc/application/modules/rest/controllers/MediaController.php
 2014-11-18 09:24:38 -05:00
drigato 91e7f7053d Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas 2014-11-18 09:16:25 -05:00
Albert Santoni 2494e66bb0 Merge branch '2.5.x' into saas 2014-11-14 11:56:01 -05:00
Duncan Sommerville 1e8df2b027 Merge branch '2.5.x' of https://github.com/sourcefabric/Airtime into 2.5.x 2014-11-14 10:02:01 -05:00
Duncan Sommerville fcbb1c2ee7 String updates 2014-11-14 10:01:06 -05:00
localizer b5575d9953 updated translation resources 2014-11-14 10:53:06 +00:00
localizer 9d29b84081 updated translation resources 2014-11-14 10:49:07 +00:00
localizer ee0d89913b updated translation resources 2014-11-14 09:59:25 +00:00
Albert Santoni 0a0e7cb8f3 Regenerate the .po files... 2014-11-13 14:31:41 -05:00
Albert Santoni 21ea2a2933 Merge branch '2.5.x' into saas 
Conflicts:
	airtime_mvc/application/models/Show.php
 2014-11-13 14:22:25 -05:00
localizer 9e74b26fc4 updated translation resources 2014-11-13 19:07:10 +00:00
Albert Santoni 0681e80afd Regenerated the .po files 2014-11-13 13:56:47 -05:00
Duncan Sommerville 51274920e1 Cosmetic updates 2014-11-13 10:20:58 -05:00
Duncan Sommerville 6b8163748d Updated styles for csrf elements 2014-11-13 09:46:44 -05:00
drigato 7d86ea3115 Better error handling on media PUT request 2014-11-13 09:41:46 -05:00
drigato 2827db8ba3 Fix bad merge 2014-11-13 09:05:02 -05:00
omniton 2eb1fee4a7 fixed po file format 2014-11-13 12:09:06 +03:00
Albert Santoni 864352c6a7 Merge branch 'cc-5709-airtime-analyzer' into saas 
Conflicts:
	python_apps/airtime_analyzer/airtime_analyzer/status_reporter.py
 2014-11-12 17:04:00 -05:00
drigato 97b74a0997 Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas 
Conflicts:
	airtime_mvc/application/models/Schedule.php
 2014-11-12 15:08:35 -05:00
drigato f1fa4929ae Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage 
Conflicts:
	python_apps/airtime_analyzer/setup.py
 2014-11-12 14:51:18 -05:00
drigato 95517cac87 Fix exception thrown when the analyzer doesn't return filesize with the metadata 2014-11-12 14:45:50 -05:00
drigato c132cac43d Code cleanup 2014-11-12 14:42:34 -05:00
Duncan Sommerville c580e8a569 Removed references to show instance description 2014-11-11 19:07:33 -05:00
Albert Santoni a4ae1a7842 Translation update, and fixed bad merge in fr_FR 2014-11-11 18:19:49 -05:00
drigato 10db978a2b Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas 2014-11-11 16:30:50 -05:00
drigato 5cf5ff4fa1 code cleanup 2014-11-11 16:29:54 -05:00
drigato b304e2fa34 Bug fix 2014-11-11 13:56:17 -05:00
Duncan Sommerville ca34ad8bdc Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas 2014-11-10 16:08:50 -05:00
Duncan Sommerville 769e0e1d82 Fixed 'clear' button not working when files failed to import 2014-11-10 16:07:51 -05:00
drigato 4893d087e2 Bug fix 2014-11-10 12:53:07 -05:00
drigato 8733788807 Added NOT NULL to cloud_file foreign key field 2014-11-10 10:55:15 -05:00
drigato 6b058ade0b Upgrade script fix 2014-11-10 10:50:15 -05:00
drigato 13f6b693d6 Fixed upgrade.sql script 2014-11-10 10:37:01 -05:00
Albert Santoni fbdd3f1dc4 Merge branch 'saas' of github.com:sourcefabric/Airtime into saas 2014-11-10 09:59:51 -05:00
Albert Santoni 3618433792 Add separate pro.po file for Airtime Pro strings 2014-11-10 09:59:37 -05:00
Duncan Sommerville af8c6c2f48 Merged 2.5.x into saas 2014-11-10 09:08:03 -05:00
drigato 4b10e024da Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas 2014-11-07 12:35:23 -05:00
Duncan Sommerville f6bf2f8cc5 Changed tabs to spaces 2014-11-07 12:05:29 -05:00
drigato 1dc72d5ebe Changed Amazon S3 download URL format so it works with S3_EU_WEST region. 
Updated amazon config file path in the downloader class
 2014-11-07 11:51:11 -05:00
Duncan Sommerville 4dab2abf4e Replaced reoccurring strings with string formatting to aid dynamic translations 2014-11-06 18:40:19 -05:00
Duncan Sommerville 8fc7178d82 Added several global constants for reoccurring strings in Airtime to aid dynamic translations 2014-11-06 18:40:19 -05:00
Duncan Sommerville efd05c4b77 Added the _initTranslationGlobals function to bind PHP globals to javascript vars for dynamic translation purposes 2014-11-06 18:40:06 -05:00
Duncan Sommerville 795e239ff3 Made several reoccurring strings into application constants and altered any static strings containing them to use these constants in string format calls. 2014-11-06 18:39:48 -05:00
Duncan Sommerville 62a915f109 Added global define for application name 2014-11-06 11:57:05 -05:00
Duncan Sommerville 4d263ce897 Merged 2.5.x into saas 2014-11-05 17:36:58 -05:00
Duncan Sommerville 3046003a1b Removed unnecessary cookie declaration for default locale 2014-11-05 17:27:41 -05:00
Duncan Sommerville 3b588dcce8 Removed unnecessary call to set locale data on the Login page 2014-11-05 17:27:08 -05:00
Duncan Sommerville 534b56351e Added styles to completely hide csrf elements on the page; changed tabs to spaces 2014-11-05 17:26:05 -05:00
Duncan Sommerville e5e7942b42 Added getUserLocale function to pull locale data into the Login form 2014-11-05 17:24:54 -05:00