drigato
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
Duncan Sommerville
7eef9d941e
Recommitting filesize checks in smartReadFile
2015-02-03 16:33:48 -05:00
Duncan Sommerville
d5477dfb5b
Fix misordering of params in readfile function
2015-02-03 16:23:26 -05:00
Duncan Sommerville
b5f6077c04
Quick fix for pro
2015-02-03 16:22:12 -05:00
drigato
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
Duncan Sommerville
6601e016a6
Removed unused variable
2015-02-03 15:19:41 -05:00
Duncan Sommerville
e0269e1e22
smartReadFile fix for saas show-logo
2015-02-03 14:16:44 -05:00
Albert Santoni
75ce732512
Fixed bad merge
2015-02-02 18:04:08 -05:00
Albert Santoni
7717692b41
Merge branch '2.5.x' into saas
2015-02-02 18:03:39 -05:00
Albert Santoni
df4bc01ff8
Log all PHP errors (including parse errors) to our zend log
2015-02-02 18:03:13 -05:00
Albert Santoni
147ded498b
PHP 5.3 compatibility fix for my Sentry code
2015-02-02 16:56:03 -05:00
Albert Santoni
f69e5afbff
SAAS-576: Fixed the Sentry data sanitizer and moved DSN into a config file
2015-02-02 14:42:20 -05:00
drigato
5040eb498d
SAAS-560: Deploy separate cloud storage config files for each development environment
2015-02-02 12:54:56 -05:00
Albert Santoni
8e4aa298d0
Scrub Sentry API KEY (old one is revoked)
2015-01-27 19:55:30 -05:00
Albert Santoni
c9231e9136
Sentry logging for Airtime Pro
2015-01-27 19:54:42 -05:00
Albert Santoni
163227439c
Raise exception again in index.php as alternative to die()
...
* Backport from saas
2015-01-27 18:27:03 -05:00
Albert Santoni
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
Albert Santoni
e83c86a0ff
Refactored the logging class to reduce code, use error levels correctly, and improve performance.
2015-01-27 18:24:13 -05:00
Albert Santoni
f7d26c0dde
Merge branch '2.5.x' into saas
2015-01-27 15:39:40 -05:00
Albert Santoni
2b323400fc
Indentation and undefined variable fix in Block.php
2015-01-27 15:39:21 -05:00
Albert Santoni
ebfce1f68b
Merge branch '2.5.x' into saas
2015-01-27 15:16:24 -05:00
Albert Santoni
0ba5452e03
Log the SERVER_NAME too
2015-01-27 15:16:11 -05:00
Albert Santoni
f93bc85f67
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
2015-01-27 12:14:24 -05:00
Albert Santoni
e216a03d37
SAAS-562: UpgradeController broken
2015-01-27 12:13:58 -05:00
drigato
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
Duncan Sommerville
8d4f94a41f
Merge branch '2.5.x' into saas
2015-01-26 17:50:18 -05:00
Duncan Sommerville
e3165a12c3
Regex tweak
2015-01-26 17:49:58 -05:00
Duncan Sommerville
b569e9a294
Merge branch '2.5.x' into saas
2015-01-26 17:44:41 -05:00
Duncan Sommerville
322d85931b
CC-5988 - Better error message & regex for Transition Fade field on stream settings page
2015-01-26 17:41:10 -05:00
drigato
44ff8f830f
Fixed Amazon S3 Proxy class bug
2015-01-26 16:06:32 -05:00
Albert Santoni
8f59ec0861
ProxyStorageBackend::getFilePrefix() bugfix
2015-01-26 14:18:59 -05:00
Albert Santoni
8cfe2ec839
Fix capitalization of Amazon cloud storage config section
2015-01-26 14:11:41 -05:00
Albert Santoni
bd3110b3af
Renamed Amazon_S3 class to Amazon_S3StorageBackend
2015-01-26 14:06:03 -05:00
Albert Santoni
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
Albert Santoni
dbba5a7427
Decouple Billing and S3 cloud storage stuff from Zend
2015-01-26 13:10:10 -05:00
Albert Santoni
49667e3d2d
Squash logging
2015-01-26 12:12:27 -05:00
drigato
ac8fadfc80
Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
CREDITS
airtime_mvc/application/modules/rest/controllers/MediaController.php
airtime_mvc/application/views/scripts/form/support-setting.phtml
2015-01-23 16:36:31 -05:00
drigato
ef6572aea9
Merge branch '2.5.x' into saas
...
Conflicts:
airtime_mvc/tests/application/services/database/datasets/test_ccShowInsertedIntoDatabase.xml
2015-01-23 16:24:09 -05:00
drigato
7d00f5213d
SAAS-559: Turn off sql notices during upgrade
2015-01-23 16:08:22 -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
Albert Santoni
239aae029e
Added image_path to unit tests.
2015-01-22 17:30:29 -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
d5ee710f89
Fixed CSRF token checking in MediaController (broken by last 2 commits)
...
* Also fixed getOwnerId(), no longer calls a non-existent function
2015-01-22 12:20:13 -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
bade613e80
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
...
Conflicts:
airtime_mvc/application/modules/rest/controllers/MediaController.php
2015-01-22 11:19:25 -05:00
Albert Santoni
fd42c67b0b
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
2015-01-21 18:08:05 -05:00
Duncan Sommerville
a40067ca55
Moved REST authorization boilerplate to Zend Acl_plugin
2015-01-21 17:20:04 -05:00
Duncan Sommerville
2c2f7ebc5f
Initial commit for update to ACL for REST module; NEEDS TESTING
2015-01-21 15:34:15 -05:00
Duncan Sommerville
7e2cc65f32
Merge branch '2.5.x' into saas
2015-01-21 15:15:58 -05:00
Duncan Sommerville
6492128ce9
Hide Now Playing toolbar for Guest users
2015-01-21 15:15:22 -05:00
