Albert Santoni
ceb51100ec
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-10-29 17:58:56 -04:00
Albert Santoni
c590869311
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
2014-10-29 17:57:25 -04:00
Albert Santoni
fd39db2e24
Merge pull request #75 - Saas relder csrf delete file
2014-10-29 17:55:42 -04:00
Albert Santoni
dd5176c209
Merge pull request #76 from RobertElder/saas-relder-cors-localhost
...
Don't throw exceptions for localhost in CORSHelper.
2014-10-29 17:35:25 -04:00
Duncan Sommerville
2f96885d65
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
2014-10-28 13:30:16 -04:00
Duncan Sommerville
53c4301024
Wrapped json_encode call in PHP version check
2014-10-28 13:29:35 -04:00
drigato
10f3c0a290
Merge branch '2.5.x' into saas
2014-10-28 10:29:42 -04:00
drigato
1d3180cc80
CC-5932: Update is_scheduled query is too slow
...
Forgot to remove some debugging statements
2014-10-28 10:29:25 -04:00
drigato
64a68c972d
Merge branch '2.5.x' into saas
2014-10-28 10:26:14 -04:00
drigato
eae1b4e17c
CC-5932: Update is_scheduled query is too slow
2014-10-28 10:25:40 -04:00
Duncan Sommerville
1a90184a69
Merging 2.5.x into saas
2014-10-27 16:27:45 -04:00
Duncan Sommerville
275ca5eed6
Resolved differences merging 2.5.x into saas
2014-10-27 16:25:42 -04:00
Duncan Sommerville
d4e8eed51d
Marked old functions for API calls as deprecated
2014-10-27 15:52:58 -04:00
Duncan Sommerville
e6cf1c7cb9
Updated occurrence of GetPlayOrderRange to use old version for backwards compatibility
2014-10-27 15:52:14 -04:00
drigato
7018f45c0a
Check filesize is greater than zero before deleteing a file from library
2014-10-27 12:39:02 -04:00
Robert Elder
a88c0233d6
Don't throw exceptions for localhost in CORSHelper.
2014-10-27 15:07:12 +00:00
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
Duncan Sommerville
e6b9a71d00
Merge branch '2.5.x' of https://github.com/sourcefabric/Airtime into 2.5.x
2014-10-24 15:12:17 -04:00
Duncan Sommerville
598b18b65a
Added live-info-v2 and station metadata api calls
2014-10-24 15:11:27 -04:00
Robert Elder
c02ed026f4
Support for tokens in multipart file upload using API.
2014-10-24 03:57:35 +00: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
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
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
Robbt
fe291cdc8c
Added sort tracks by upload time to smart blocks criteria
2014-10-19 23:02:40 -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
Robert Elder
9fb35c448e
Resolved merge conflicts for merging cc-5709-airtime-analyzer into saas.
2014-10-10 19:57:22 +00: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
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
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
Albert Santoni
1bb17c5614
Blacklist free products from upgrade page
2014-09-23 16:01:28 -04: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
drigato
36b908b4d1
Merge branch '2.5.x' into saas
2014-09-19 15:30:16 -04:00
drigato
66b97158b7
Make API on by default - fix
2014-09-19 15:30:06 -04:00
drigato
a0b40e1f7d
Merge branch '2.5.x' into saas
2014-09-19 15:00:58 -04:00
