Commit Graph

12403 Commits

Author SHA1 Message Date
Albert Santoni 670a63df87 Error handling for if propel isn't found / composer wasn't run 2014-11-26 18:04:46 -05:00
Albert Santoni 8fbe7dd649 Report an error and die if amazon.conf is missing 2014-11-26 17:50:59 -05:00
drigato 884a4c493d Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
Conflicts:
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/application/modules/rest/controllers/MediaController.php
	python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
2014-11-26 11:42:40 -05:00
drigato f08535cc10 Merge branch '2.5.x' into cc-5709-airtime-analyzer
Conflicts:
	airtime_mvc/application/Bootstrap.php
2014-11-26 10:35:48 -05:00
drigato 544767a775 Merge branch 'cc-5709-airtime-analyzer-cloud-storage' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-cloud-storage 2014-11-20 17:11:50 -05:00
drigato 8e8fe2d288 SAAS-489: Cannot preview tracks stored on disk 2014-11-20 17:11:23 -05:00
Albert Santoni 7db571d103 Remove clearAction from the media REST API for security 2014-11-20 16:47:02 -05:00
Albert Santoni 8ffd70781b Remove clearAction from the media REST API for security 2014-11-20 16:46:21 -05:00
drigato 00fbda193e Schedule->removeItems optimization fix for deleting the current playing track 2014-11-20 09:57:37 -05:00
drigato 48ae8ac69c Scheduler->removeItems optimization 2014-11-19 15:13:33 -05:00
Albert Santoni 12550112fd Remove base URL from selenium tests to make the Selenium IDE happy 2014-11-19 11:28:03 -05:00
Albert Santoni c829b6bf95 Fix bad merge 2014-11-18 18:17:19 -05:00
Albert Santoni dd3b54f8ed Actually delete files from the database via the media REST API 2014-11-18 18:15:45 -05:00
Albert Santoni 11a31375df Slightly more robust fix for the last issue 2014-11-18 17:41:44 -05:00
Duncan Sommerville 6460854fda Fixed 'clear' button not working when files failed to import 2014-11-18 17:13:48 -05:00
Albert Santoni e7e1926896 CC-5950: Fix for issue where clear button in Recent Uploads didn't work
sometimes
2014-11-18 17:11:09 -05:00
drigato 3c73abc786 SAAS-491: Edit meta data not working
Fixed: Propel 1.7 does not cast string types to integers
2014-11-18 10:32:03 -05:00
drigato d42db75445 Merge branch 'cc-5709-airtime-analyzer-cloud-storage' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-cloud-storage
Conflicts:
	airtime_mvc/application/modules/rest/controllers/MediaController.php
2014-11-18 09:15:14 -05:00
Albert Santoni 32bdbe1ad6 Improved some comments 2014-11-14 11:12:10 -05:00
localizer b5575d9953 updated translation resources 2014-11-14 10:53:06 +00:00
localizer 9d29b84081 updated translation resources 2014-11-14 10:49:07 +00:00
localizer ee0d89913b updated translation resources 2014-11-14 09:59:25 +00:00
Albert Santoni 0a0e7cb8f3 Regenerate the .po files... 2014-11-13 14:31:41 -05:00
localizer 9e74b26fc4 updated translation resources 2014-11-13 19:07:10 +00:00
Albert Santoni 0681e80afd Regenerated the .po files 2014-11-13 13:56:47 -05:00
drigato 7d86ea3115 Better error handling on media PUT request 2014-11-13 09:41:46 -05:00
drigato 2827db8ba3 Fix bad merge 2014-11-13 09:05:02 -05:00
Albert Santoni 71f2cc11d2 Fix for incorrect watchdog disabling 2014-11-12 17:04:21 -05:00
Albert Santoni 2d20e58c91 Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer 2014-11-12 17:02:11 -05:00
Albert Santoni 8eaeaf71f9 airtime_analyzer status_reporter shutdown fix 2014-11-12 17:01:59 -05:00
drigato f1fa4929ae Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
Conflicts:
	python_apps/airtime_analyzer/setup.py
2014-11-12 14:51:18 -05:00
drigato 95517cac87 Fix exception thrown when the analyzer doesn't return filesize with the metadata 2014-11-12 14:45:50 -05:00
drigato c132cac43d Code cleanup 2014-11-12 14:42:34 -05:00
Duncan Sommerville c580e8a569 Removed references to show instance description 2014-11-11 19:07:33 -05:00
Albert Santoni b324031ee6 Disable those new requirements because pip requires gcc to install them 2014-11-11 18:41:09 -05:00
drigato 5cf5ff4fa1 code cleanup 2014-11-11 16:29:54 -05:00
drigato dbc55632e1 Changed print statements so they go to the pypo log 2014-11-11 13:58:55 -05:00
drigato b304e2fa34 Bug fix 2014-11-11 13:56:17 -05:00
drigato 49f3881da0 rmq_config_path fix 2014-11-11 13:56:02 -05:00
drigato eb0f12c709 Change back rabbitmq config file param name 2014-11-11 13:55:46 -05:00
Albert Santoni 63b357f0ee Updated requirements for airtime_analyzer to make python-requests
support SNI properly
2014-11-11 11:18:55 -05:00
drigato c63627267c composer.lock 2014-11-07 13:06:18 -05:00
drigato fa88e72d82 Removed composer.lock from gitignore 2014-11-07 13:02:09 -05:00
drigato ecc0225ff5 Added apache-libcloud dependency to airtime_analyzer 2014-11-07 12:49:10 -05:00
Duncan Sommerville f6bf2f8cc5 Changed tabs to spaces 2014-11-07 12:05:29 -05:00
drigato 1dc72d5ebe Changed Amazon S3 download URL format so it works with S3_EU_WEST region.
Updated amazon config file path in the downloader class
2014-11-07 11:51:11 -05:00
Duncan Sommerville 4dab2abf4e Replaced reoccurring strings with string formatting to aid dynamic translations 2014-11-06 18:40:19 -05:00
Duncan Sommerville 8fc7178d82 Added several global constants for reoccurring strings in Airtime to aid dynamic translations 2014-11-06 18:40:19 -05:00
Duncan Sommerville efd05c4b77 Added the _initTranslationGlobals function to bind PHP globals to javascript vars for dynamic translation purposes 2014-11-06 18:40:06 -05:00
Duncan Sommerville 795e239ff3 Made several reoccurring strings into application constants and altered any static strings containing them to use these constants in string format calls. 2014-11-06 18:39:48 -05:00