Commit Graph

5103 Commits

Author SHA1 Message Date
drigato 7edd993fa3 Reverted pypo's copy file method to how it was without cloud files
and instead directly call the cloud file's downloader method.
2014-10-24 15:50:52 -04:00
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
Robert Elder f29f30e3ac Include base_dir in session namespaces. 2014-10-22 14:37:47 +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
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
Albert Santoni f439072422 Merge branch '2.5.x' into cc-5709-airtime-analyzer 2014-10-10 11:21:49 -04:00
localizer 736acda14e updated translation resources 2014-10-09 04:27:12 +00: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 from RobertElder/session
Regenerate session ids.
2014-10-07 10:10:41 -04:00
dpsommer 9a21b99fdf Merge pull request from RobertElder/more-tokens
More tokens
2014-10-07 10:10:14 -04:00
dpsommer 159ab47857 Merge pull request from RobertElder/tokens
Add form tokens to several forms.
2014-10-07 10:05:59 -04:00
dpsommer e803676d1b Merge pull request 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
localizer 657a47a576 updated translation resources 2014-09-22 02:46:15 +00: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
drigato 66b97158b7 Make API on by default - fix 2014-09-19 15:30:06 -04:00
drigato 28399b70cc Make API on by default 2014-09-19 14:57:43 -04:00
localizer e5e350dfe4 updated translation resources 2014-09-17 23:49:10 +00:00
drigato 8379862016 Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2014-09-16 16:52:59 -04:00
drigato afa9a27bb9 Japanese Plupload i18n file 2014-09-16 16:51:53 -04:00
localizer 66e73cac57 updated translation resources 2014-09-16 00:12:10 +00:00
drigato 2729202dc4 Corrected japanese locale from ja to ja_JP 2014-09-12 16:29:47 -04:00
localizer e1bb017c9a updated translation resources 2014-09-12 00:51:07 +00:00
localizer db49ab3c7f updated translation resources 2014-09-11 09:34:10 +00:00
localizer 9e7bffb02a updated translation resources 2014-09-09 13:14:14 +00:00
Albert Santoni f7b6e3379e Enable Japanese locale 2014-09-08 20:49:08 -04:00
drigato a21b4f177d Fixed a bug where we weren't checking if a variable was empty before using it 2014-09-08 13:14:23 -04:00
drigato 2670bfae7a Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2014-09-08 13:12:30 -04:00
localizer fd88fc09aa updated translation resources 2014-09-08 00:38:12 +00:00
localizer 1117984032 updated translation resources 2014-09-05 05:45:12 +00:00
Albert Santoni 4c1e6d3fe3 Fixed base URL
Conflicts:
	airtime_mvc/application/controllers/LocaleController.php
2014-09-04 17:09:09 -04:00
drigato 0ccc7e7dc9 SAAS-470: Zend Rest module doesn't work on Ubuntu 14.04
The Bootstrap.php in the modules directory didn't like
short php tags.
2014-08-28 16:52:47 -04:00
drigato 52f3ed816e Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/plugins/Acl_plugin.php
2014-08-28 12:01:42 -04:00
drigato 9fe0830dfd Merge branch '2.5.x' into cc-5709-airtime-analyzer
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/LoginController.php
	airtime_mvc/application/controllers/plugins/Acl_plugin.php
2014-08-28 11:59:41 -04:00
Albert Santoni 716cc5a754 Disable the APC cache for Ubuntu 14.04. APC is deprecated now so we need a better solution anyways. 2014-08-27 18:51:06 -04:00
localizer 6843b528b6 updated translation resources 2014-08-27 01:20:18 +00:00