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
Albert Santoni
68cd5b027a
CC-5998: Prevent users from spamming the delete button in the library
2015-02-18 15:56:28 -05:00
Albert Santoni
b90a7972e1
Merge pull request #95 from danielhjames/2.5.x
...
Removed obsolete localization files
2015-02-18 10:16:41 -05:00
Daniel James
0c14f51455
Removed more obsolete files, more complete versions are now in ja directory
2015-02-18 11:05:46 +00:00
Daniel James
ebf2b49108
Removed obsolete localization files, now in hy_AM
2015-02-18 11:02:36 +00: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
localizer
cd994c0928
updated translation resources
2015-02-05 10:32:16 +00: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
e32a26956b
Fixed the unit tests again
2015-02-02 13:31:52 -05:00
Albert Santoni
9baed1b328
Make the unit tests pass again
2015-02-02 13:14:14 -05:00
Albert Santoni
536094ea50
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
2015-02-02 13:05:32 -05:00
Albert Santoni
3e6f3abb23
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
2015-02-02 12:26:36 -05:00
Albert Santoni
ee6862e731
Fixed quotation issue with playability analyzer
2015-02-02 12:26:22 -05:00
Albert Santoni
3f6983aa3e
Renabling CuePointAnalyzer
2015-02-02 12:18:33 -05:00
Albert Santoni
163227439c
Raise exception again in index.php as alternative to die()
...
* Backport from saas
2015-01-27 18:27:03 -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
drigato
3f97ed3d55
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
2015-01-27 16:46:06 -05:00
drigato
ea868607b4
Enabling cuepoint analyzer because the silan bug has been fixed
2015-01-27 16:44:21 -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
43c6475f1b
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
2015-01-26 09:18:32 -05:00
drigato
6adaf7a91a
Disabling cue point analyzer
2015-01-26 09:17:53 -05:00
Albert Santoni
239aae029e
Added image_path to unit tests.
2015-01-22 17:30:29 -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
6ebe8ec6c8
Pin python-daemon to 1.6 because 2.0.3 breaks setuptools
2015-01-22 12:42:05 -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
476128ce87
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
2015-01-22 11:29:47 -05:00
