drigato
|
0a45de7fba
|
Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas
Conflicts:
.gitignore
airtime_mvc/application/configs/airtime-conf.php
airtime_mvc/application/configs/classmap-airtime-conf.php
airtime_mvc/application/models/RabbitMq.php
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/models/StoredFile.php
airtime_mvc/application/models/airtime/map/CcShowInstancesTableMap.php
airtime_mvc/application/models/airtime/map/CcShowTableMap.php
airtime_mvc/application/models/airtime/om/BaseCcShow.php
airtime_mvc/application/models/airtime/om/BaseCcShowInstances.php
airtime_mvc/application/models/airtime/om/BaseCcShowInstancesPeer.php
airtime_mvc/application/models/airtime/om/BaseCcShowInstancesQuery.php
airtime_mvc/application/models/airtime/om/BaseCcShowPeer.php
airtime_mvc/application/models/airtime/om/BaseCcShowQuery.php
airtime_mvc/application/modules/rest/Bootstrap.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
airtime_mvc/build/sql/schema.sql
airtime_mvc/public/index.php
|
2014-11-03 12:29:58 -05:00 |
drigato
|
7e1d14fcf2
|
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
|
2014-11-03 10:31:49 -05:00 |
drigato
|
52b0db5ccd
|
Merge branch '2.5.x' into cc-5709-airtime-analyzer
|
2014-11-03 10:29:53 -05:00 |
Albert Santoni
|
8616cee9a3
|
Merge pull request #73 from RobertElder/2.5.x-relder-jplayer-upgrade
Upgrade jPlayer library from 2.5.0 (7th November 2013) to 2.7.0 (1st Sep...
|
2014-10-31 15:49:45 -04:00 |
Duncan Sommerville
|
057993eeeb
|
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
|
2014-10-30 17:43:31 -04:00 |
Duncan Sommerville
|
ef9ab1acf0
|
Merge branch '2.5.x' into saas
|
2014-10-30 17:42:55 -04:00 |
Duncan Sommerville
|
7bc07a91f2
|
Merge branch '2.5.x' of https://github.com/sourcefabric/Airtime into 2.5.x
|
2014-10-30 17:41:42 -04:00 |
Duncan Sommerville
|
8f5af6556d
|
CC-5935 - Added fix for insidious pypofetch bug causing dangling RabbitMQ channel
|
2014-10-30 17:41:00 -04:00 |
drigato
|
b871b32175
|
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
|
2014-10-30 12:17:34 -04:00 |
drigato
|
54d1bcf81e
|
Merge branch '2.5.x' into cc-5709-airtime-analyzer
|
2014-10-30 12:15:41 -04:00 |
drigato
|
e23649173d
|
Added comments to CcFiles and CloudFile classes.
|
2014-10-30 12:12:47 -04:00 |
Albert Santoni
|
359727fc66
|
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
Conflicts:
airtime_mvc/application/modules/rest/controllers/MediaController.php
|
2014-10-29 18:01:31 -04:00 |
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 |
drigato
|
01ad2ab832
|
Commented cloud storage classes
|
2014-10-29 17:42: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 |
drigato
|
978fc43a82
|
Started commenting CloudStorageUploader class
|
2014-10-29 10:47:32 -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 |
Duncan Sommerville
|
d467714f84
|
Fixed bug where timezone wasn't adjusting correctly when adding or editing a show
|
2014-10-27 15:42:30 -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 |
Albert Santoni
|
23cbd80e09
|
Merge pull request #74 from RobertElder/saas-relder-multipart-tokens
Support for tokens in multipart file upload using API.
|
2014-10-27 01:35:30 -04: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 |
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 |