drigato
16dc286420
SAAS-503: PYPO -> Use the REST API to download files
2014-12-03 13:22:52 -05:00
drigato
6cb993cc80
SAAS-504: Store provider in db
2014-11-27 15:44:53 -05:00
drigato
477ac337e5
Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
airtime_mvc/application/models/StoredFile.php
python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
2014-11-26 11:54:07 -05:00
drigato
884a4c493d
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
...
Conflicts:
airtime_mvc/application/models/StoredFile.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
2014-11-26 11:42:40 -05:00
Albert Santoni
ca7d0688e7
Merge branch 'cc-5709-airtime-analyzer' into saas
...
Conflicts:
airtime_mvc/application/modules/rest/controllers/MediaController.php
2014-11-20 16:47:35 -05:00
Albert Santoni
7db571d103
Remove clearAction from the media REST API for security
2014-11-20 16:47:02 -05:00
Albert Santoni
8ffd70781b
Remove clearAction from the media REST API for security
2014-11-20 16:46:21 -05:00
Duncan Sommerville
c627342e28
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
2014-11-19 15:21:14 -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
Duncan Sommerville
6460854fda
Fixed 'clear' button not working when files failed to import
2014-11-18 17:13:48 -05:00
drigato
34453b5548
Removed setting the directory for cloud files
2014-11-18 10:57:21 -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
drigato
91e7f7053d
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-11-18 09:16:25 -05:00
Duncan Sommerville
51274920e1
Cosmetic updates
2014-11-13 10:20:58 -05:00
drigato
7d86ea3115
Better error handling on media PUT request
2014-11-13 09:41:46 -05:00
drigato
2827db8ba3
Fix bad merge
2014-11-13 09:05:02 -05:00
Albert Santoni
864352c6a7
Merge branch 'cc-5709-airtime-analyzer' into saas
...
Conflicts:
python_apps/airtime_analyzer/airtime_analyzer/status_reporter.py
2014-11-12 17:04:00 -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
f1fa4929ae
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
...
Conflicts:
python_apps/airtime_analyzer/setup.py
2014-11-12 14:51:18 -05:00
drigato
95517cac87
Fix exception thrown when the analyzer doesn't return filesize with the metadata
2014-11-12 14:45:50 -05:00
Duncan Sommerville
769e0e1d82
Fixed 'clear' button not working when files failed to import
2014-11-10 16:07:51 -05:00
drigato
6cda01fba9
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-11-03 13:15:21 -05:00
drigato
27b8f0ac13
Removed delete-success view script because action no longer exists.
2014-11-03 13:15:04 -05:00
drigato
87d5d3cb02
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
airtime_mvc/application/modules/rest/Bootstrap.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
2014-11-03 13:11:22 -05:00
drigato
5f98151009
Removed unused route from rest Media Controller
2014-11-03 12:57:41 -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
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
fd39db2e24
Merge pull request #75 - Saas relder csrf delete file
2014-10-29 17:55:42 -04:00
Robert Elder
c02ed026f4
Support for tokens in multipart file upload using API.
2014-10-24 03:57:35 +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
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
Duncan Sommerville
05a8fdf091
Removed disk quota check from image upload, updated doc for processUploadedImage function
2014-09-18 18:23:13 -04:00
Duncan Sommerville
28824219f8
Added delete images endpoint to ShowController
2014-09-18 16:30:03 -04:00
Duncan Sommerville
b525638829
Changed extension check to MIME-type checking
2014-09-18 10:36:40 -04:00
Duncan Sommerville
080b2581b6
Changed RestAuth functions to static for ease-of-access
2014-09-18 10:35:26 -04:00
Duncan Sommerville
1cf3a5ca3a
Fixed always deleting file tree for show image even if directory was non-existant
2014-09-17 19:53:23 -04:00
Duncan Sommerville
f724d86b6a
Updated mkdir call to allow for creation of nested directories
2014-09-17 12:16:35 -04:00
Duncan Sommerville
d6476fffcd
Added Logging to image upload
2014-09-17 12:05:39 -04:00
Duncan Sommerville
6e1244ca33
Added Logging to imag upload
2014-09-17 12:02:55 -04:00
Duncan Sommerville
f64b7d0813
Updated show edit functionality to accommodate uploading new show image
2014-09-17 10:27:14 -04:00
Duncan Sommerville
3655c261ac
Shifted Auth functions into separate class to avoid code duplication (not moved from MediaController yet)
2014-09-16 18:11:41 -04:00
Duncan Sommerville
e31eb17cfa
Added ShowController to handle show image uploads
2014-09-16 18:10:29 -04:00
Duncan Sommerville
da293f610f
Added setNoRender call to MediaController and removed unnecessary views
2014-09-16 18:06:45 -04:00
drigato
ace883c975
Merge branch 'cc-5709-airtime-analyzer' into saas-fix-modules-bootstrap-14-04
...
Conflicts:
airtime_mvc/application/configs/application.ini
airtime_mvc/application/controllers/plugins/Acl_plugin.php
airtime_mvc/application/models/Cache.php
2014-08-28 17:01:03 -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
