fe7071b5e3
SAAS-596: Store file size and hash in database
...
Fixing bad merge ?(not really sure what happened here)
2015-02-17 16:28:33 -05:00
c1086842d3
Merge branch 'cc-5709-airtime-analyzer-store-file-size-and-hash-in-db' into saas-store-file-size-and-hash-in-db
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
2015-02-17 16:19:58 -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
a07a1edcc0
SAAS-595 - Updated validation and sanitization
2015-02-17 12:17:49 -05:00
eb40379152
SAAS-595 - Changed Zend validation and added sanitization in file import process to throw out bad track number metadata
2015-02-17 11:44:31 -05:00
a1436bfebb
ShowImageController update to add comments and remove unnecessary code
2015-02-09 12:15:19 -05:00
2cf0f7da7a
Merge branch 'cc-5709-airtime-analyzer' into saas
...
Conflicts:
airtime_mvc/application/configs/ACL.php
2015-02-06 16:06:32 -05:00
2a9790adf3
Backport ACL REST permission fix
2015-02-06 16:05:51 -05:00
a20f90cd2d
Marginally better error handling for 401 in REST controller
2015-02-06 15:20:01 -05:00
7bf96e09a5
Tweaked ACL plugin again temporarily
2015-02-06 14:45:07 -05:00
bcd7e3d70f
Rollback last commit due to REST error when downloading files
2015-02-06 14:43:34 -05:00
ed190c30f3
Merge branch 'cc-5709-airtime-analyzer' into saas
2015-02-06 14:33:17 -05:00
4b6e5671c3
REST permission fix
2015-02-06 14:33:02 -05:00
74e142c3d7
Fix for ACL REST error
2015-02-06 14:28:25 -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
e2ff452b8a
Merge branch 'saas' into saas-cloud-storage-config-per-dev-env
2015-02-05 10:15:48 -05:00
826ae17552
SAAS-580 - Fixed routing issue causing show art to not upload; changed ShowController to be more RESTful
2015-02-04 15:09:27 -05:00
c6fc184559
Merge branch 'saas' into saas-cloud-storage-config-per-dev-env
...
Conflicts:
python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
python_apps/airtime_analyzer/airtime_analyzer/cloud_storage_uploader.py
python_apps/airtime_analyzer/airtime_analyzer/message_listener.py
2015-02-04 13:36:35 -05:00
7eef9d941e
Recommitting filesize checks in smartReadFile
2015-02-03 16:33:48 -05:00
d5477dfb5b
Fix misordering of params in readfile function
2015-02-03 16:23:26 -05:00
b5f6077c04
Quick fix for pro
2015-02-03 16:22:12 -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
6601e016a6
Removed unused variable
2015-02-03 15:19:41 -05:00
e0269e1e22
smartReadFile fix for saas show-logo
2015-02-03 14:16:44 -05:00
75ce732512
Fixed bad merge
2015-02-02 18:04:08 -05:00
7717692b41
Merge branch '2.5.x' into saas
2015-02-02 18:03:39 -05:00
df4bc01ff8
Log all PHP errors (including parse errors) to our zend log
2015-02-02 18:03:13 -05:00
147ded498b
PHP 5.3 compatibility fix for my Sentry code
2015-02-02 16:56:03 -05:00
f69e5afbff
SAAS-576: Fixed the Sentry data sanitizer and moved DSN into a config file
2015-02-02 14:42:20 -05:00
5040eb498d
SAAS-560: Deploy separate cloud storage config files for each development environment
2015-02-02 12:54:56 -05:00
8e4aa298d0
Scrub Sentry API KEY (old one is revoked)
2015-01-27 19:55:30 -05:00
c9231e9136
Sentry logging for Airtime Pro
2015-01-27 19:54:42 -05:00
163227439c
Raise exception again in index.php as alternative to die()
...
* Backport from saas
2015-01-27 18:27:03 -05:00
1ddc27bb77
Merge branch '2.5.x' into saas
...
Conflicts:
airtime_mvc/application/controllers/ScheduleController.php
airtime_mvc/public/index.php
2015-01-27 18:26:39 -05:00
e83c86a0ff
Refactored the logging class to reduce code, use error levels correctly, and improve performance.
2015-01-27 18:24:13 -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
ebfce1f68b
Merge branch '2.5.x' into saas
2015-01-27 15:16:24 -05:00
0ba5452e03
Log the SERVER_NAME too
2015-01-27 15:16:11 -05:00
f93bc85f67
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
2015-01-27 12:14:24 -05:00
e216a03d37
SAAS-562: UpgradeController broken
2015-01-27 12:13:58 -05:00
648198b3e6
Fixed unit tests by including the vendor directory for propel files, and the cloud_storage directory
2015-01-27 10:53:58 -05:00
8d4f94a41f
Merge branch '2.5.x' into saas
2015-01-26 17:50:18 -05:00
e3165a12c3
Regex tweak
2015-01-26 17:49:58 -05:00
b569e9a294
Merge branch '2.5.x' into saas
2015-01-26 17:44:41 -05:00
322d85931b
CC-5988 - Better error message & regex for Transition Fade field on stream settings page
2015-01-26 17:41:10 -05:00
44ff8f830f
Fixed Amazon S3 Proxy class bug
2015-01-26 16:06:32 -05:00
8f59ec0861
ProxyStorageBackend::getFilePrefix() bugfix
2015-01-26 14:18:59 -05:00
8cfe2ec839
Fix capitalization of Amazon cloud storage config section
2015-01-26 14:11:41 -05:00
bd3110b3af
Renamed Amazon_S3 class to Amazon_S3StorageBackend
2015-01-26 14:06:03 -05:00
drigato
Duncan Sommerville
Albert Santoni