Albert Santoni
903de66349
Merge branch 'cc-5709-airtime-analyzer-refactor' into saas-media-refactor
...
Conflicts:
airtime_mvc/application/cloud_storage/ProxyStorageBackend.php
airtime_mvc/application/configs/conf.php
airtime_mvc/application/controllers/ApiController.php
airtime_mvc/application/models/StoredFile.php
airtime_mvc/application/models/airtime/CcFiles.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
airtime_mvc/application/services/MediaService.php
2015-02-20 16:52:00 -05:00
drigato
5e9252a562
SAAS-587: Add stream urls to station-metadata API
...
Fix typo
2015-02-20 15:52:13 -05:00
drigato
6dcc7ee2fc
SAAS-587: Add stream urls to station-metadata API
2015-02-20 15:50:40 -05:00
drigato
40d6249229
Merge branch 'saas' into saas-embed-player
2015-02-20 14:47:57 -05:00
Albert Santoni
2e2c3d6276
Merge of cc-5709-airtime-analyzer-saas-refactor into saas
2015-02-20 14:27:16 -05:00
Albert Santoni
2a89e4d5a0
Massive refactor of the analyzer branch and sync it back up with the
...
cloud storage branch (for the last time)
* Backported all the bugfixes from cc-5709-airtime-analyzer-cloud-storage
* Backported missing FileStorageBackend.php
* Fixed CC-6001: Track titles and artist names with slashes break audio preview
* Refactored all the MediaController code, pulling out the logic into MediaService
* Fixed an API key leak to guests in the Media API
* Made this branch work without cloud_storage.conf (defaults to file storage)
* Made ApiController's getMediaAction use the MediaService code
2015-02-20 14:01:06 -05:00
Duncan Sommerville
be7cae4408
Fixed CSRF prevention checks for REST calls, moved CSRF initialization to Bootstrap
2015-02-20 13:12:49 -05:00
Albert Santoni
6d00da89db
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/application/models/airtime/CcFiles.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
2015-02-20 11:14:11 -05:00
drigato
fd0db11450
SAAS-596: Store file size and hash in database
...
Added upgrader class to add new filesize column
2015-02-19 16:27:50 -05:00
Albert Santoni
ddab1943f6
Merge branch '2.5.x' into saas
2015-02-19 09:20:57 -05:00
Albert Santoni
b3a46b948f
CC-5999: Unknown file type: audio/vorbis
2015-02-19 09:19:27 -05:00
Albert Santoni
961cdfc2ee
CC-5849: Audio preview audio/x-wav exception
2015-02-18 19:41:56 -05:00
Albert Santoni
857ad9615e
CC-5849: Audio preview audio/x-wav exception
2015-02-18 19:40:27 -05:00
Albert Santoni
0535626df1
Merge branch 'saas-file-sanitization' into saas
...
Conflicts:
airtime_mvc/application/modules/rest/controllers/MediaController.php
2015-02-18 17:19:26 -05:00
Albert Santoni
9098e204e5
Merge branch 'cc-5709-airtime-analyzer' into saas-file-sanitization
...
Conflicts:
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
2015-02-18 17:18:43 -05:00
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
