Commit Graph

12909 Commits

Author SHA1 Message Date
drigato 70ff67374b Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
Conflicts:
	python_apps/airtime_analyzer/airtime_analyzer/filemover_analyzer.py
2014-10-22 17:16:46 -04:00
drigato 8134687c24 Merge branch '2.5.x' into cc-5709-airtime-analyzer 2014-10-22 17:13:42 -04:00
drigato 9726fb80d2 Removed amazon s3 signature from pypo cache file name.
Stopped pyppo from downloading amazon s3 files if it already exists in the pypo cache dir.
2014-10-22 14:17:44 -04:00
Albert Santoni 21e86c2687 Merge branch 'saas' of github.com:sourcefabric/Airtime into saas 2014-10-22 11:39:59 -04:00
Albert Santoni 363d022b0c Merge branch 'cc-5709-airtime-analyzer' into saas 2014-10-22 11:39:52 -04:00
Albert Santoni 53dc92b204 StatusReporter exception handler to prevent thread from dying under any circumstances 2014-10-22 11:39:22 -04:00
Albert Santoni 54523e264c Fix rare exception during shutdown in airtime_analyzer 2014-10-22 11:38:22 -04:00
Robert Elder aec189089a Merge branch '2.5.x' into saas 2014-10-22 14:46:32 +00:00
Robert Elder f29f30e3ac Include base_dir in session namespaces. 2014-10-22 14:37:47 +00:00
Albert Santoni c4af1b6b19 Merge branch 'cc-5709-airtime-analyzer' into saas 2014-10-21 19:24:03 -04:00
Albert Santoni 82f251f061 Fix invalid python in StatusReporter 2014-10-21 19:23:48 -04:00
Robert Elder e1b2c51130 Upgrade jPlayer library from 2.5.0 (7th November 2013) to 2.7.0 (1st September 2014) to resolve playback issues. 2014-10-21 20:15:05 +00:00
drigato f775bedb49 Stopped returning filesize in delete functions.
Created an Amazon S3 wrapper class around Zend_Service_Amazon_S3 to add more functionality.
2014-10-21 16:05:50 -04:00
Albert Santoni a1ef9d60c0 Merge branch 'cc-5709-airtime-analyzer' into saas 2014-10-21 15:36:51 -04:00
Albert Santoni 28be5c6bd3 CC-5929: Certain long filenames can result in the extension getting cut off 2014-10-21 15:34:10 -04:00
Robert Elder 6857d6269f Merge branch '2.5.x' into saas 2014-10-20 15:25:05 +00:00
drigato 544d20ebc2 Replaced spaces with dashes in resource_id generation
Fixed track preview and download signed urls
Removed cloud_storage_deleter.py file
Changed cloud_storage settings in airtime.conf
2014-10-17 17:16:53 -04:00
drigato a10e287368 Fixed a fresh install bug that wasn't using composer installs.
Fixed a cloud file download bug where it was downloading the wrong track.
Working on amazon s3 signed urls for private objects.
Added cloud storage configuration to install script.
2014-10-14 16:54:58 -04:00
Robert 05096dc808 Merge pull request #71 from RobertElder/fix-exit
Disable exit on error when checking if apache2.4 is installed.
2014-10-11 11:15:03 -04:00
Robert Elder 9fb35c448e Resolved merge conflicts for merging cc-5709-airtime-analyzer into saas. 2014-10-10 19:57:22 +00:00
Robert Elder 874adf0fb3 Disable exit on error when checking if apache2.4 is installed. 2014-10-10 15:49:56 +00:00
Albert Santoni 081ca0a6a4 Reworked upstart config for airtime_analyzer 2014-10-10 11:28:44 -04:00
Albert Santoni f439072422 Merge branch '2.5.x' into cc-5709-airtime-analyzer 2014-10-10 11:21:49 -04:00
Duncan Sommerville 0196aa21f5 Fixed testcases to account for show image path in and show instance description 2014-10-09 09:39:50 -04:00
localizer 736acda14e updated translation resources 2014-10-09 04:27:12 +00:00
Duncan Sommerville 6ade74163d Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas 2014-10-08 18:03:16 -04:00
Duncan Sommerville a84e0761ca Updated file deletion to remove cc_files rows properly when deleting from the Library 2014-10-08 18:01:06 -04:00
drigato 2423ea6787 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage 2014-10-08 11:46:30 -04:00
drigato c4692cc0d7 Merge branch '2.5.x' into cc-5709-airtime-analyzer
Conflicts:
	airtime_mvc/application/controllers/PluploadController.php
	airtime_mvc/application/views/scripts/plupload/index.phtml
2014-10-08 11:46:08 -04:00
dpsommer 5cc93eac3c Merge pull request #68 from RobertElder/session
Regenerate session ids.
2014-10-07 10:10:41 -04:00
dpsommer 9a21b99fdf Merge pull request #70 from RobertElder/more-tokens
More tokens
2014-10-07 10:10:14 -04:00
dpsommer 159ab47857 Merge pull request #69 from RobertElder/tokens
Add form tokens to several forms.
2014-10-07 10:05:59 -04:00
dpsommer e803676d1b Merge pull request #67 from RobertElder/2.5.x
PHP ini settings for cookies.
2014-10-07 10:04:13 -04:00
localizer b861375959 updated translation resources 2014-10-07 13:42:14 +00:00
localizer cf1d65363c updated translation resources 2014-10-03 05:39:12 +00:00
Robert Elder 185d84dc01 Increase the time token is valid for in case of long uploads. 2014-10-03 02:18:04 +00:00
Robert Elder feff7f4343 tokens for multipart data upload. 2014-10-02 02:04:03 +00:00
Robert Elder 5c69eda010 Tokens for Stream Settings page. 2014-10-01 20:55:07 +00:00
Robert Elder 29b05343bd Tokens for add User. 2014-10-01 19:36:36 +00:00
Robert Elder dbed915469 Tokens for preferences form. 2014-10-01 19:36:17 +00:00
Robert Elder 2be4a5f9d0 Add form tokens to several forms. 2014-09-30 23:09:27 +00:00
Robert Elder 78cc43d33d Regenerate session ids. 2014-09-29 22:48:52 +00:00
Robert Elder f0397bbc59 PHP ini settings for cookies. 2014-09-29 18:22:10 +00:00
localizer ff16cefa62 updated translation resources 2014-09-29 06:43:17 +00:00
Albert Santoni 1bb17c5614 Blacklist free products from upgrade page 2014-09-23 16:01:28 -04:00
Albert Santoni 5a62611b00 Merge pull request #62 from dpsommer/2.5.x
Updated Ubuntu airtime-full-install to fix apache version issue
2014-09-23 11:00:07 -07:00
Albert Santoni 77348f01af Merge pull request #63 from hlmnrmr/2.5.x
Switch from GPL to AGPL
2014-09-23 10:59:25 -07:00
localizer 657a47a576 updated translation resources 2014-09-22 02:46:15 +00:00
drigato bc603ddd33 Merge branch '2.5.x' into saas 2014-09-19 15:42:05 -04:00
drigato 3c797c044a Undoing make API on by default for now. This needs to be done in the db 2014-09-19 15:41:55 -04:00