drigato
5fdca78041
Scheduler->removeItems optimization
2014-11-19 14:30:18 -05:00
Albert Santoni
755df62a00
Merge branch 'cc-5709-airtime-analyzer' into saas
...
Conflicts:
airtime_mvc/application/models/StoredFile.php
2014-11-18 18:18:44 -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
4f7f64af7a
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-11-18 17:45:08 -05:00
Albert Santoni
11a31375df
Slightly more robust fix for the last issue
2014-11-18 17:41:44 -05:00
Albert Santoni
162995bb49
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-11-18 17:14:01 -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
501b22c48d
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-11-18 10:32:28 -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
4d8b32556b
Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
airtime_mvc/application/modules/rest/controllers/MediaController.php
2014-11-18 09:24:38 -05:00
Albert Santoni
21ea2a2933
Merge branch '2.5.x' into saas
...
Conflicts:
airtime_mvc/application/models/Show.php
2014-11-13 14:22:25 -05:00
drigato
97b74a0997
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
airtime_mvc/application/models/Schedule.php
2014-11-12 15:08:35 -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
drigato
b304e2fa34
Bug fix
2014-11-11 13:56:17 -05:00
drigato
4893d087e2
Bug fix
2014-11-10 12:53:07 -05:00
Duncan Sommerville
af8c6c2f48
Merged 2.5.x into saas
2014-11-10 09:08:03 -05:00
drigato
4b10e024da
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-11-07 12:35:23 -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
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
Duncan Sommerville
4d263ce897
Merged 2.5.x into saas
2014-11-05 17:36:58 -05:00
Duncan Sommerville
e5e7942b42
Added getUserLocale function to pull locale data into the Login form
2014-11-05 17:24:54 -05:00
Duncan Sommerville
90626a2fcb
Formatting; Changed tabs to spaces
2014-11-05 17:04:18 -05:00
Duncan Sommerville
02be09b5ff
Fixed issue with improper array initialization
2014-11-05 10:15:16 -05:00
Duncan Sommerville
5275669211
Updated i18n to use multiple domains
2014-11-04 17:03:52 -05:00
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
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
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
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
drigato
7018f45c0a
Check filesize is greater than zero before deleteing a file from library
2014-10-27 12:39:02 -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
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
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
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
