Albert Santoni
964d7d1326
Merge branch 'cc-5709-airtime-analyzer' into saas
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
2015-02-18 16:42:04 -05:00
Albert Santoni
17f1d0e96d
Simplify the metadata sanitization and bugfix it
...
* SAAS-376 and CC-5868
2015-02-18 16:29:08 -05:00
Albert Santoni
2ae921e9d7
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
2015-02-18 16:16:41 -05:00
Duncan Sommerville
72e4a036a4
Cleaning up editFileMD in LibraryController
2015-02-17 15:09:18 -05:00
Duncan Sommerville
29d7e20622
Fixing file metadata sanitization
2015-02-17 12:39:58 -05:00
Duncan Sommerville
29c6ae15b0
Merged cc-5709-airtime-analyzer into saas-file-sanitization
2015-02-17 12:19:11 -05:00
Duncan Sommerville
a07a1edcc0
SAAS-595 - Updated validation and sanitization
2015-02-17 12:17:49 -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
drigato
c261182c8f
Skeleton player form/view/controller
2015-02-12 14:08:06 -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
Albert Santoni
2cb26db84b
SAAS-547: Refactor upgrade procedure in 2.5.x-installer branch
...
* Start using "schema_version" key instead of "system_version"
* Refactored the upgrade code a bit and make it be automatically invoked
from the Zend bootstrap if a schema update is needed.
* Fixed error logging in certain cases
* Fixed an exception in Show related to image_path
2015-01-19 13:41:23 -05:00
Albert Santoni
5abe364a69
Forgot to rename the 2.5.5 upgrade.sql to 2.5.2
2015-01-16 17:31:11 -05:00
Albert Santoni
c03dd38c00
Merge branch '2.5.x' into 2.5.x-installer
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/models/Show.php
2015-01-16 17:27:52 -05:00
Duncan Sommerville
44018b2cbf
Changed status page to use config-check (tentative) and removed time-intensive check in index routing
2015-01-16 16:15:16 -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
Duncan Sommerville
791466b023
Fixes for code review https://github.com/sourcefabric/Airtime/pull/84
2015-01-15 16:33:33 -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
Albert Santoni
ee9163fa8e
2.5.2: Reorganize upgrade path so that 2.5.2 contains the show art schema changes
...
* Also bump the system_version number to 2.5.2. This will be deprecated sooner or later...
2015-01-15 12:42:36 -05:00
Duncan Sommerville
5e22f929c7
Reverted commit mistakenly changing file modifiers to 755
2015-01-14 20:45:03 -05:00
