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

3933 commits

Author SHA1 Message Date
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
c868136d26 Make airtime_analyzer respect the storage_backend setting passed to it 
by Airtime
 2015-02-20 18:21:49 -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
84f0f135ef More refactoring: Allow files to be imported from disk directly 2015-02-20 16:36:36 -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
487ab9bd99 CC-5868: Make the BPM field less strict 2015-02-19 09:31:23 -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
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
a07a1edcc0 SAAS-595 - Updated validation and sanitization 2015-02-17 12:17:49 -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
Albert Santoni
2a9790adf3 Backport ACL REST permission fix 2015-02-06 16:05:51 -05:00
Albert Santoni
4b6e5671c3 REST permission fix 2015-02-06 14:33:02 -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
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
2b323400fc Indentation and undefined variable fix in Block.php 2015-01-27 15:39:21 -05:00
Albert Santoni
0ba5452e03 Log the SERVER_NAME too 2015-01-27 15:16:11 -05:00
Duncan Sommerville
e3165a12c3 Regex tweak 2015-01-26 17:49:58 -05:00
Duncan Sommerville
322d85931b CC-5988 - Better error message & regex for Transition Fade field on stream settings page 2015-01-26 17:41:10 -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
62f2a0babf CC-5981: Admin users can't delete webstreams created by other users 2015-01-21 11:31:28 -05:00
drigato
6ac5a2950f SAAS-551: Cannot schedule shows due to overlapping show check bug 2015-01-20 11:32:15 -05:00
Albert Santoni
0c3395289d Merge pull request #78 from Robbt/realtime-smart-blocks 
Added sort tracks by upload time to smart blocks criteria
 2015-01-19 15:36:28 -05:00
drigato
38882abd1a SAAS-542: ryerson.airtime.pro file doesn't play, preview, or download 2015-01-16 15:15:37 -05:00
drigato
527d2851af SAAS-542: ryerson.airtime.pro file doesn't play, preview, or download 2015-01-16 15:15:14 -05:00
Daniel James
cfe3527b93 Fix link to user manual 2015-01-15 16:33:03 +00:00
Albert Santoni
c4d3a8fa62 Massive simplification of the GeneralPreferences dialog 
* The purpose of this was so that we can use Zend_Form_Element
  decorators, which I need.
 2015-01-13 20:51:46 -05:00
Duncan Sommerville
a0e5c975dd Merge branch '2.5.x' of https://github.com/sourcefabric/Airtime into 2.5.x 2015-01-13 15:50:38 -05:00
drigato
2185fc9ca4 SAAS-536: Check for future scheduled files uses cloud_file id instead of cc_files id 2015-01-13 15:49:57 -05:00
Albert Santoni
caf37e1b87 CC-5975: Default fade-in/out, and crossfade time validators don't work 
* Fixed the number formatting and validation in the preferences and streaming preferences
  (the silly 00.5-style numbers are gone)
* Regex decmical validation of the default fade-in, fade-out, and
  crossfade duration was totally broken (you could enter words and it would work). That's fixed now.
 2015-01-13 12:18:57 -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