Commit Graph

13836 Commits

Author SHA1 Message Date
Albert Santoni 37f9f273c7 Fixed the airtime_analyzer unit tests 2015-02-24 17:03:38 -05:00
drigato 38aa1d1cd9 Merge branch 'saas' into saas-store-file-size-and-hash-in-db 2015-02-24 16:44:17 -05:00
Albert Santoni 31ea92d983 Added VERSION to the .gitignore 2015-02-24 16:36:17 -05:00
drigato d843de80cc Remove log statements 2015-02-24 16:22:20 -05:00
drigato 6113dff182 Debugging logs 2015-02-24 15:19:46 -05:00
Albert Santoni 562c2f0100 Remove widget JS snippet animation because it's bugged 2015-02-24 15:18:39 -05:00
Albert Santoni 19c7533d07 Merge pull request #86 from sourcefabric/2.5.x-albertenhancements
Moved the Station Logo field to GeneralPreferences, and stopped using AJAX on the general prefs form
2015-02-24 15:05:23 -05:00
Albert Santoni e13e4413ea Merge remote-tracking branch 'origin/2.5.x-albertenhancements' into saas 2015-02-24 15:03:06 -05:00
Albert Santoni a6579e4d09 Merge branch 'saas' of github.com:sourcefabric/Airtime into saas 2015-02-24 13:14:40 -05:00
Albert Santoni 702de0f5f5 SAAS-602: Fix getaddrinfo deadlock (again)
Conflicts:
	python_apps/airtime_analyzer/airtime_analyzer/cloud_storage_uploader.py
2015-02-24 13:14:21 -05:00
Albert Santoni a52e2faeb9 SAAS-602: Fix getaddrinfo deadlock (again) 2015-02-24 13:10:20 -05:00
drigato 86ba5c547e SAAS-596: Store file size and hash in database
Fixed exception handling in pypo
2015-02-24 12:32:46 -05:00
Duncan Sommerville 5e256df061 Added remove button for station logo on preferences page 2015-02-24 12:12:30 -05:00
Albert Santoni b2a2153572 Merge branch '2.5.x' into saas 2015-02-24 12:04:11 -05:00
Albert Santoni 8a88b4b733 Reduce the pypo POLL_INTERVAL to lessen impact of RabbitMQ or web server outages 2015-02-24 12:03:35 -05:00
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
Duncan Sommerville e20655f391 Added /usr/local/bin airtime files to uninstall 2015-02-24 11:05:28 -05:00
drigato be7a6854f0 SAAS-596: Store file size and hash in database
Have pypo fetch the file size and md5, if necessary, and make request to
Airtime to set these values
2015-02-24 11:00:41 -05:00
Duncan Sommerville 69d588d2f6 Merge branch '2.5.x' into 2.5.x-albertenhancements 2015-02-24 10:45:52 -05:00
Duncan Sommerville 6ea169092b Pulls locales from correct directory if not installing to /usr/share 2015-02-24 10:41:10 -05:00
Albert Santoni 6eea40dbd8 Merge pull request #102 from danielhjames/2.5.x-installer
Debian/Ubuntu require a force-reload option for sysvinit scripts
2015-02-24 10:33:32 -05:00
Daniel James 72f79d0f90 Debian/Ubuntu require a force-reload option for sysvinit scripts 2015-02-24 14:57:28 +00:00
Albert Santoni 5a8798ab51 Merge pull request #101 from danielhjames/2.5.x-installer
More permissions tweaks for Debian/Ubuntu compliance
2015-02-24 09:34:13 -05:00
Daniel James 4b850a5675 More permissions tweaks for Debian/Ubuntu compliance 2015-02-24 14:16:44 +00:00
Albert Santoni 8aaf300491 Attempt a workaround for unicode hostname resolution deadlock in the
analyzer
2015-02-23 18:22:16 -05:00
Albert Santoni 1a8883b91d Merge branch '2.5.x-installer' of github.com:sourcefabric/Airtime into 2.5.x-installer 2015-02-23 12:50:43 -05:00
Albert Santoni 9edec88dac Merge pull request #100 from danielhjames/2.5.x-installer
Fix permissions on files for Debian/Ubuntu compliance
2015-02-23 12:45:03 -05:00
Daniel James 071715415b Fix permissions on files for Debian/Ubuntu compliance 2015-02-23 17:41:56 +00:00
drigato 47a7b0245e Merge branch 'saas' into saas-store-file-size-and-hash-in-db 2015-02-23 10:29:34 -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
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 a931e282e1 SAAS-585: Create Embeddable Player form
Fixed up the stream urls options
2015-02-20 15:44:25 -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
Duncan Sommerville 33ebca00db Small fix to BPM sanitization 2015-02-20 14:23: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