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

4508 commits

Author SHA1 Message Date
Albert Santoni
c0db309e32 Merge branch 'cc-5709-airtime-analyzer-refactor' into saas-media-refactor 
Conflicts:
	airtime_mvc/application/controllers/plugins/Acl_plugin.php
 2015-02-24 11:18:49 -05:00
Albert Santoni
7600b8ae82 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-refactor 2015-02-24 11:16:44 -05:00
Albert Santoni
90aa1faea4 Merge branch '2.5.x' into cc-5709-airtime-analyzer 2015-02-24 11:16:19 -05:00
Albert Santoni
e2130df51c Merge branch 'cc-5709-airtime-analyzer-csrf' into cc-5709-airtime-analyzer 2015-02-24 11:15:27 -05:00
Albert Santoni
73e5fb938f Use more secure random number generation for CSRF auth tokens 
* Also cleaned up pull request
 2015-02-24 11:13:39 -05:00
Albert Santoni
51aa846a4c Merge branch 'cc-5709-airtime-analyzer-refactor' into saas-media-refactor 
Conflicts:
	airtime_mvc/application/models/RabbitMq.php
	python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
	python_apps/airtime_analyzer/airtime_analyzer/message_listener.py
 2015-02-20 18:25:38 -05:00
Albert Santoni
c868136d26 Make airtime_analyzer respect the storage_backend setting passed to it 
by Airtime
 2015-02-20 18:21:49 -05:00
Albert Santoni
0c537194ec Merge branch 'cc-5709-airtime-analyzer-refactor' into saas-media-refactor 2015-02-20 17:36:15 -05:00
Albert Santoni
909cbae5f4 Added new parameter to CcFiles::createFromLocalFile() for flexibility 2015-02-20 17:34:58 -05:00
Albert Santoni
6858316dfc Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer 2015-02-20 17:26:53 -05:00
Duncan Sommerville
ce36c1be18 Removed unnecessary call to BaseCcFiles->delete 2015-02-20 16:58:09 -05:00
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
Albert Santoni
84f0f135ef More refactoring: Allow files to be imported from disk directly 2015-02-20 16:36:36 -05:00
Albert Santoni
2e2c3d6276 Merge of cc-5709-airtime-analyzer-saas-refactor into saas 2015-02-20 14:27:16 -05:00
Duncan Sommerville
61a47aeb27 Small fix to BPM sanitization 2015-02-20 14:01:29 -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
Albert Santoni
0177e40083 Pull the logic for Media REST API out of the controller 2015-02-19 15:10:01 -05:00
Albert Santoni
73cb14155c Replace the version hashing with git revision hashing to fix browser 
caching
 2015-02-19 10:01:09 -05:00
Albert Santoni
5a644ae0b8 Merge branch 'cc-5709-airtime-analyzer' into saas 2015-02-19 09:31:58 -05:00
Albert Santoni
487ab9bd99 CC-5868: Make the BPM field less strict 2015-02-19 09:31:23 -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
08c53a9292 Fixed incorrect authorization for ShowImage API 2015-02-18 18:34:52 -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
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
Albert Santoni
d2fae5adae Testing out only creating the database tables ... 2015-02-17 16:49:52 -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
04e138b124 Merged cc-5709-airtime-analyzer into saas-file-sanitization 2015-02-17 11:51:00 -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
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