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

2192 Commits

Author SHA1 Message Date
drigato 19e6f1a535 SAAS-526: Change prefix from station name to station id 
Done.
 2014-12-17 16:48:20 -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 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
drigato 09c30bde1b Regenerated Propel models because some fields and methods were missing. 2014-12-16 10:53:39 -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 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 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 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 6cb993cc80 SAAS-504: Store provider in db 2014-11-27 15:44:53 -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 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 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
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 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
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
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 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
drigato b304e2fa34 Bug fix 2014-11-11 13:56:17 -05:00
drigato 4893d087e2 Bug fix 2014-11-10 12:53:07 -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
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 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 4d263ce897 Merged 2.5.x into saas 2014-11-05 17:36:58 -05:00
Duncan Sommerville e5e7942b42 Added getUserLocale function to pull locale data into the Login form 2014-11-05 17:24:54 -05:00