Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
13705 commits 3 branches 0 tags 405 MiB
Commit graph

4787 commits

Author SHA1 Message Date
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
b76ab27230 Fixed the unit tests: Ensure key in $_SERVER exists. 2015-02-18 17:03:16 -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
Albert Santoni
717d322dc8 Fix typo breaking provisioning/create/ 2015-02-18 15:22:47 -05:00
Albert Santoni
12c0617e57 Set up the cc_music_dirs entry in /provisioning/create 2015-02-18 13:27:52 -05:00
Albert Santoni
dcac7ab652 Fixed a couple of bugs in the new /provisioning/create API 2015-02-18 12:21:15 -05:00
drigato
5bd3371ec2 SAAS-596: Store file size and hash in database 
Removed getFileSize from CloudFile.php since it can call the parent
function.
Moved setting filesize metadata from cloud_storage_uploader.
 2015-02-17 16:51:25 -05:00
Albert Santoni
d2fae5adae Testing out only creating the database tables ... 2015-02-17 16:49:52 -05:00
drigato
fe7071b5e3 SAAS-596: Store file size and hash in database 
Fixing bad merge ?(not really sure what happened here)
 2015-02-17 16:28:33 -05:00
drigato
c1086842d3 Merge branch 'cc-5709-airtime-analyzer-store-file-size-and-hash-in-db' into saas-store-file-size-and-hash-in-db 
Conflicts:
	airtime_mvc/application/Bootstrap.php

airtime_mvc/application/modules/rest/controllers/MediaController.php
 2015-02-17 16:19:58 -05:00
Duncan Sommerville
72e4a036a4 Cleaning up editFileMD in LibraryController 2015-02-17 15:09:18 -05:00
drigato
6ccc634782 SAAS-596: Store file size and hash in database 
Updated schema and added filesize and md5_hash columns.
Changed getFileSize functions to return the value stored in the
database.
Removed getFileSize from the cloud storage classes.
 2015-02-17 14:51:51 -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
04e138b124 Merged cc-5709-airtime-analyzer into saas-file-sanitization 2015-02-17 11:51:00 -05:00
drigato
4fd7b4c622 SAAS-585: Create Embeddable Player form 
Added stream urls - hardcoded for now
 2015-02-17 11:48:43 -05:00
Duncan Sommerville
eb40379152 SAAS-595 - Changed Zend validation and added sanitization in file import process to throw out bad track number metadata 2015-02-17 11:44:31 -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
56cae34259 Fix typo 2015-02-12 14:20:54 -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
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