Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,276 Commits 3 Branches 0 Tags 405 MiB
Commit Graph

1654 Commits

Author SHA1 Message Date
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
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
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
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
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 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 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 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 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
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
drigato 57a7218a79 SAAS-540: Change the Provisioning Controller's terminate endpoint to reflect new S3 file prefix 2015-01-16 11:09:13 -05:00
Albert Santoni 7c28b66ce9 Merge branch '2.5.x-albertenhancements' into saas 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/forms/Preferences.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
 2015-01-15 16:32:29 -05:00
Albert Santoni f9bf71a349 Moved the Station Logo field to GeneralPreferences, and stopped using 
AJAX on the general prefs form
 2015-01-15 16:28:18 -05:00
drigato d99147bad4 Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas 2015-01-13 14:23:51 -05:00
drigato 7bdf34fcd1 Logging 2015-01-12 15:58:50 -05:00
drigato 8f0f69abd9 More logging 2015-01-12 15:45:33 -05:00
drigato 44b82fdd8a More logging statements 2015-01-12 15:37:48 -05:00
Albert Santoni f0bad70cee Merge branch '2.5.x' into saas-pullreq77 
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/ApiController.php
 2015-01-09 13:10:54 -05:00
Mark Lewis 17a577fbbb use is_numeric instead of is_int as values are strings 2015-01-09 13:02:25 -05:00
Mark Lewis 1b03bd7fbd use new var instaead of calling getShowListContent again 2015-01-09 13:02:25 -05:00
Mark Lewis fc8e65944e added error checked for required params 2015-01-09 13:02:25 -05:00
Mark Lewis 1cc1f8a378 return error for missing instance_id on show-tracks action 2015-01-09 13:02:25 -05:00
Mark Lewis 174cf79d84 clean up shows endpoint, remove dependency on Show model 2015-01-09 13:02:25 -05:00
Mark Lewis 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
Mark Lewis 03dae5be2b fix spacing in ApiController 2015-01-09 13:01:43 -05:00
Mark Lewis 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
drigato 6ee97d9c53 Upgrade sql was missing the storage_backend column 2014-12-18 18:55:37 -05:00
drigato ab4ebb2969 SAAS-525: Station Termination -> Delete cloud_file table records 
Deleted cloud_file records.
Renamed the function that does this.
 2014-12-16 14:13:57 -05:00