Duncan Sommerville
67155b136a
Add downgrade action to UpgradeController, fix SoundCloud schema and bugs
2015-06-24 18:38:04 -04:00
Duncan Sommerville
76a7aa9a24
Fix SoundCloud and TaskManager bugs, switch tasks to use acks_late, and provide feedback from SoundCloud context menu items
2015-06-18 18:18:48 -04:00
Duncan Sommerville
8d2e476ff1
SAAS-868 - Refactor third party + celery workflow, implement locking on TaskManager
2015-06-16 15:10:08 -04:00
Duncan Sommerville
626489bb3b
SAAS-853 - Celery backend for SoundCloud uploads
2015-06-10 15:04:49 -04:00
Duncan Sommerville
b0b6e037ac
CC-6046, CC-6045, CC-6047 - New SoundCloud implementation
2015-06-03 16:57:17 -04:00
Albert Santoni
d31de0937f
Refactored file storage code slightly to allow multiple download URLs
2015-03-30 11:31:07 -04:00
Albert Santoni
99d16444d2
Squash unlink warning in CcFiles.php
2015-03-25 10:51:51 -04:00
drigato
55ed21a155
SAAS-606: Enable disk quota on Airtime Pro
2015-03-11 13:50:17 -04:00
Albert Santoni
6cecb7c239
Simplified the FTP upload hook
2015-03-06 11:06:17 -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
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
Albert Santoni
0b1af01822
Better exception logging and small pypo exception fix
2015-02-26 13:52:51 -05:00
Albert Santoni
ab6d83f49d
Merge branch 'saas' into saas-media-refactor
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
2015-02-26 13:10:13 -05:00
Albert Santoni
bfd6ef72b1
Fixed download URLs for non-cloud files
2015-02-26 11:29:08 -05:00
Albert Santoni
5acad059de
Insert leading slash into basedir for station URL
2015-02-25 16:09:08 -05:00
Albert Santoni
3a1141d4c8
Merge branch 'saas' into saas-media-refactor
...
Conflicts:
airtime_mvc/application/cloud_storage/ProxyStorageBackend.php
airtime_mvc/application/controllers/ApiController.php
2015-02-25 13:02:11 -05:00
Albert Santoni
0c537194ec
Merge branch 'cc-5709-airtime-analyzer-refactor' into saas-media-refactor
2015-02-20 17:36:15 -05:00
Albert Santoni
909cbae5f4
Added new parameter to CcFiles::createFromLocalFile() for flexibility
2015-02-20 17:34:58 -05:00
Duncan Sommerville
ce36c1be18
Removed unnecessary call to BaseCcFiles->delete
2015-02-20 16:58:09 -05:00
Albert Santoni
903de66349
Merge branch 'cc-5709-airtime-analyzer-refactor' into saas-media-refactor
...
Conflicts:
airtime_mvc/application/cloud_storage/ProxyStorageBackend.php
airtime_mvc/application/configs/conf.php
airtime_mvc/application/controllers/ApiController.php
airtime_mvc/application/models/StoredFile.php
airtime_mvc/application/models/airtime/CcFiles.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
airtime_mvc/application/services/MediaService.php
2015-02-20 16:52:00 -05:00
Albert Santoni
84f0f135ef
More refactoring: Allow files to be imported from disk directly
2015-02-20 16:36:36 -05:00
Albert Santoni
2e2c3d6276
Merge of cc-5709-airtime-analyzer-saas-refactor into saas
2015-02-20 14:27:16 -05:00
Albert Santoni
2a89e4d5a0
Massive refactor of the analyzer branch and sync it back up with the
...
cloud storage branch (for the last time)
* Backported all the bugfixes from cc-5709-airtime-analyzer-cloud-storage
* Backported missing FileStorageBackend.php
* Fixed CC-6001: Track titles and artist names with slashes break audio preview
* Refactored all the MediaController code, pulling out the logic into MediaService
* Fixed an API key leak to guests in the Media API
* Made this branch work without cloud_storage.conf (defaults to file storage)
* Made ApiController's getMediaAction use the MediaService code
2015-02-20 14:01:06 -05:00
Albert Santoni
6d00da89db
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/application/models/airtime/CcFiles.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
2015-02-20 11:14:11 -05:00
Albert Santoni
0177e40083
Pull the logic for Media REST API out of the controller
2015-02-19 15:10:01 -05:00
drigato
e5d6797ce7
SAAS-596: Store file size and hash in database
...
Removed md5_hash column from cc_files since there is already a md5
column
2015-02-19 10:34:35 -05:00
drigato
5bd3371ec2
SAAS-596: Store file size and hash in database
...
Removed getFileSize from CloudFile.php since it can call the parent
function.
Moved setting filesize metadata from cloud_storage_uploader.
2015-02-17 16:51:25 -05:00
drigato
6ccc634782
SAAS-596: Store file size and hash in database
...
Updated schema and added filesize and md5_hash columns.
Changed getFileSize functions to return the value stored in the
database.
Removed getFileSize from the cloud storage classes.
2015-02-17 14:51:51 -05:00
drigato
ca9750f415
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/configs/ACL.php
airtime_mvc/application/controllers/ApiController.php
airtime_mvc/application/controllers/plugins/Acl_plugin.php
airtime_mvc/application/forms/GeneralPreferences.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
airtime_mvc/application/views/scripts/form/preferences_general.phtml
airtime_mvc/application/views/scripts/form/support-setting.phtml
airtime_mvc/build/sql/schema.sql
2015-01-23 11:32:45 -05:00
drigato
134ade877c
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
...
Conflicts:
airtime_mvc/build/sql/schema.sql
2015-01-22 15:48:34 -05:00
Albert Santoni
230cdcccb4
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
CREDITS
2015-01-22 11:29:38 -05:00
drigato
38882abd1a
SAAS-542: ryerson.airtime.pro file doesn't play, preview, or download
2015-01-16 15:15:37 -05:00
drigato
527d2851af
SAAS-542: ryerson.airtime.pro file doesn't play, preview, or download
2015-01-16 15:15:14 -05:00
drigato
19626ed4f5
SAAS-542: ryerson.airtime.pro file doesn't play, preview, or download
2015-01-16 13:26:55 -05:00
drigato
775008b274
SAAS-542: ryerson.airtime.pro file doesn't play, preview, or download
2015-01-16 12:13:04 -05:00
drigato
a4461dc79a
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2015-01-13 15:50:20 -05:00
drigato
2185fc9ca4
SAAS-536: Check for future scheduled files uses cloud_file id instead of cc_files id
2015-01-13 15:49:57 -05:00
Mark Lewis
174cf79d84
clean up shows endpoint, remove dependency on Show model
2015-01-09 13:02:25 -05:00
drigato
09c30bde1b
Regenerated Propel models because some fields and methods were missing.
2014-12-16 10:53:39 -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
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
6cb993cc80
SAAS-504: Store provider in db
2014-11-27 15:44:53 -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
drigato
b304e2fa34
Bug fix
2014-11-11 13:56:17 -05:00
drigato
4893d087e2
Bug fix
2014-11-10 12:53:07 -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
