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
84f0f135ef
More refactoring: Allow files to be imported from disk directly
2015-02-20 16:36:36 -05:00
6dcc7ee2fc
SAAS-587: Add stream urls to station-metadata API
2015-02-20 15:50:40 -05:00
2e2c3d6276
Merge of cc-5709-airtime-analyzer-saas-refactor into saas
2015-02-20 14:27:16 -05:00
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
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
0177e40083
Pull the logic for Media REST API out of the controller
2015-02-19 15:10:01 -05:00
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
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
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
cee0ff4881
SAAS-560: Deploy separate cloud storage config files for each development environment
...
Default to production config files if dev env specific files are not
found.
Fix analyzer unit tests.
2015-02-05 14:31:20 -05:00
7b3f9af04c
SAAS-560: Deploy separate cloud storage config files for each development environment
...
Changed analyzer upstart to take the cloud storage config file as a command line option
Dropped the dev env portion from the rabbitmq-analyzer.ini filename
2015-02-03 15:55:47 -05:00
5040eb498d
SAAS-560: Deploy separate cloud storage config files for each development environment
2015-02-02 12:54:56 -05:00
f7d26c0dde
Merge branch '2.5.x' into saas
2015-01-27 15:39:40 -05:00
2b323400fc
Indentation and undefined variable fix in Block.php
2015-01-27 15:39:21 -05:00
8e2366f6fb
Remove Rabbitmq.php dependency on Amazon S3 stuff (which was the main purpose of the last commit)...
2015-01-26 13:19:48 -05:00
dbba5a7427
Decouple Billing and S3 cloud storage stuff from Zend
2015-01-26 13:10:10 -05:00
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
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
230cdcccb4
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
CREDITS
2015-01-22 11:29:38 -05:00
62f2a0babf
CC-5981: Admin users can't delete webstreams created by other users
2015-01-21 11:31:28 -05:00
0c3395289d
Merge pull request #78 from Robbt/realtime-smart-blocks
...
Added sort tracks by upload time to smart blocks criteria
2015-01-19 15:36:28 -05:00
38882abd1a
SAAS-542: ryerson.airtime.pro file doesn't play, preview, or download
2015-01-16 15:15:37 -05:00
527d2851af
SAAS-542: ryerson.airtime.pro file doesn't play, preview, or download
2015-01-16 15:15:14 -05:00
19626ed4f5
SAAS-542: ryerson.airtime.pro file doesn't play, preview, or download
2015-01-16 13:26:55 -05:00
775008b274
SAAS-542: ryerson.airtime.pro file doesn't play, preview, or download
2015-01-16 12:13:04 -05:00
57a7218a79
SAAS-540: Change the Provisioning Controller's terminate endpoint to reflect new S3 file prefix
2015-01-16 11:09:13 -05:00
c4d3a8fa62
Massive simplification of the GeneralPreferences dialog
...
* The purpose of this was so that we can use Zend_Form_Element
decorators, which I need.
2015-01-13 20:51:46 -05:00
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
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
c264747a54
Removed silly logging statement
2015-01-13 15:25:36 -05:00
d99147bad4
Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas
2015-01-13 14:23:51 -05:00
caf37e1b87
CC-5975: Default fade-in/out, and crossfade time validators don't work
...
* Fixed the number formatting and validation in the preferences and streaming preferences
(the silly 00.5-style numbers are gone)
* Regex decmical validation of the default fade-in, fade-out, and
crossfade duration was totally broken (you could enter words and it would work). That's fixed now.
2015-01-13 12:18:57 -05:00
e17b330186
Remove just previously added logging statements
2015-01-12 16:26:27 -05:00
c7c683966d
Logging
2015-01-12 16:21:53 -05:00
7bdf34fcd1
Logging
2015-01-12 15:58:50 -05:00
8f0f69abd9
More logging
2015-01-12 15:45:33 -05:00
85557d4886
Logging statements
2015-01-12 15:29:41 -05:00
02e4c18931
SAAS-531: Finalize S3 folder hierarchy
2015-01-12 14:50:42 -05:00
174cf79d84
clean up shows endpoint, remove dependency on Show model
2015-01-09 13:02:25 -05:00
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
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
8d56e9e1ff
Merge branch '2.5.x' into saas
2015-01-09 10:44:47 -05:00
05c9e21e48
Recognize audio/aac as a MIME type for webstreams
2015-01-09 10:44:24 -05:00
19e6f1a535
SAAS-526: Change prefix from station name to station id
...
Done.
2014-12-17 16:48:20 -05:00
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
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
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
09c30bde1b
Regenerated Propel models because some fields and methods were missing.
2014-12-16 10:53:39 -05:00
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
d73b331376
SAAS-515: Prefix object names with station name
2014-12-10 12:40:08 -05:00
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
ec189fc27a
SAAS-509: PYPO can't download files via the REST API
2014-12-08 15:33:02 -05:00
435c49da98
Changed PYPO's download URL scheme from https to http
2014-12-08 13:57:28 -05:00
80af25fdf4
Undoing last commit
2014-12-03 18:07:24 -05:00
963207e26f
Trying the PYPO download URL without ssl
2014-12-03 18:01:08 -05:00
024150f023
SAAS-503: PYPO -> Use the REST API to download files
...
Fixed disabling SSL verication
2014-12-03 14:50:58 -05:00
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
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
16dc286420
SAAS-503: PYPO -> Use the REST API to download files
2014-12-03 13:22:52 -05:00
e1f1807f5a
SAAS-503: PYPO -> Use the REST API to download files
...
Removed Amazon S3 specific code
2014-12-02 18:46:17 -05:00
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
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
6cb993cc80
SAAS-504: Store provider in db
2014-11-27 15:44:53 -05:00
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
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
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
00fbda193e
Schedule->removeItems optimization fix for deleting the current playing track
2014-11-20 09:57:37 -05:00
767562922a
Schedule->removeItems optimization fix for deleting the current playing track
2014-11-19 17:09:54 -05:00
766c827094
Removed undefined index from show info array
2014-11-19 16:04:06 -05:00
48ae8ac69c
Scheduler->removeItems optimization
2014-11-19 15:13:33 -05:00
5fdca78041
Scheduler->removeItems optimization
2014-11-19 14:30:18 -05:00
755df62a00
Merge branch 'cc-5709-airtime-analyzer' into saas
...
Conflicts:
airtime_mvc/application/models/StoredFile.php
2014-11-18 18:18:44 -05:00
c829b6bf95
Fix bad merge
2014-11-18 18:17:19 -05:00
dd3b54f8ed
Actually delete files from the database via the media REST API
2014-11-18 18:15:45 -05:00
4f7f64af7a
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-11-18 17:45:08 -05:00
11a31375df
Slightly more robust fix for the last issue
2014-11-18 17:41:44 -05:00
162995bb49
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-11-18 17:14:01 -05:00
e7e1926896
CC-5950: Fix for issue where clear button in Recent Uploads didn't work
...
sometimes
2014-11-18 17:11:09 -05:00
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
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
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
21ea2a2933
Merge branch '2.5.x' into saas
...
Conflicts:
airtime_mvc/application/models/Show.php
2014-11-13 14:22:25 -05:00
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
c132cac43d
Code cleanup
2014-11-12 14:42:34 -05:00
c580e8a569
Removed references to show instance description
2014-11-11 19:07:33 -05:00
b304e2fa34
Bug fix
2014-11-11 13:56:17 -05:00
4893d087e2
Bug fix
2014-11-10 12:53:07 -05:00
af8c6c2f48
Merged 2.5.x into saas
2014-11-10 09:08:03 -05:00
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
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
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
4d263ce897
Merged 2.5.x into saas
2014-11-05 17:36:58 -05:00
e5e7942b42
Added getUserLocale function to pull locale data into the Login form
2014-11-05 17:24:54 -05:00
90626a2fcb
Formatting; Changed tabs to spaces
2014-11-05 17:04:18 -05:00
02be09b5ff
Fixed issue with improper array initialization
2014-11-05 10:15:16 -05:00
5275669211
Updated i18n to use multiple domains
2014-11-04 17:03:52 -05:00
0a45de7fba
Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
.gitignore
airtime_mvc/application/configs/airtime-conf.php
airtime_mvc/application/configs/classmap-airtime-conf.php
airtime_mvc/application/models/RabbitMq.php
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/models/StoredFile.php
airtime_mvc/application/models/airtime/map/CcShowInstancesTableMap.php
airtime_mvc/application/models/airtime/map/CcShowTableMap.php
airtime_mvc/application/models/airtime/om/BaseCcShow.php
airtime_mvc/application/models/airtime/om/BaseCcShowInstances.php
airtime_mvc/application/models/airtime/om/BaseCcShowInstancesPeer.php
airtime_mvc/application/models/airtime/om/BaseCcShowInstancesQuery.php
airtime_mvc/application/models/airtime/om/BaseCcShowPeer.php
airtime_mvc/application/models/airtime/om/BaseCcShowQuery.php
airtime_mvc/application/modules/rest/Bootstrap.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
airtime_mvc/build/sql/schema.sql
airtime_mvc/public/index.php
2014-11-03 12:29:58 -05:00
b871b32175
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
2014-10-30 12:17:34 -04:00
54d1bcf81e
Merge branch '2.5.x' into cc-5709-airtime-analyzer
2014-10-30 12:15:41 -04:00
Albert Santoni
drigato
Albert Santoni
Mark Lewis
Duncan Sommerville