Commit Graph

5851 Commits

Author SHA1 Message Date
Albert Santoni dcac7ab652 Fixed a couple of bugs in the new /provisioning/create API 2015-02-18 12:21:15 -05:00
Albert Santoni d2fae5adae Testing out only creating the database tables ... 2015-02-17 16:49:52 -05:00
Albert Santoni e603597101 Cleanup and comments 2015-02-17 12:13:37 -05:00
Duncan Sommerville ad5536dedd SAAS-582 - Added provisioning class to create database from within Airtime 2015-02-12 15:39:22 -05:00
Duncan Sommerville dd095e8933 Added create endpoint to provisioning controller, fixed RestAuth helper 2015-02-09 17:41:03 -05:00
Duncan Sommerville a1436bfebb ShowImageController update to add comments and remove unnecessary code 2015-02-09 12:15:19 -05:00
Albert Santoni 2cf0f7da7a Merge branch 'cc-5709-airtime-analyzer' into saas
Conflicts:
	airtime_mvc/application/configs/ACL.php
2015-02-06 16:06:32 -05:00
Albert Santoni 2a9790adf3 Backport ACL REST permission fix 2015-02-06 16:05:51 -05:00
Albert Santoni a20f90cd2d Marginally better error handling for 401 in REST controller 2015-02-06 15:20:01 -05:00
Albert Santoni 7bf96e09a5 Tweaked ACL plugin again temporarily 2015-02-06 14:45:07 -05:00
Albert Santoni bcd7e3d70f Rollback last commit due to REST error when downloading files 2015-02-06 14:43:34 -05:00
Albert Santoni ed190c30f3 Merge branch 'cc-5709-airtime-analyzer' into saas 2015-02-06 14:33:17 -05:00
Albert Santoni 4b6e5671c3 REST permission fix 2015-02-06 14:33:02 -05:00
Albert Santoni 74e142c3d7 Fix for ACL REST error 2015-02-06 14:28:25 -05:00
drigato 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
drigato e2ff452b8a Merge branch 'saas' into saas-cloud-storage-config-per-dev-env 2015-02-05 10:15:48 -05:00
Duncan Sommerville 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
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