Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
12497 commits 3 branches 0 tags 405 MiB
Commit graph

3904 commits

Author SHA1 Message Date
drigato
134ade877c Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage 
Conflicts:
	airtime_mvc/build/sql/schema.sql
 2015-01-22 15:48:34 -05:00
Albert Santoni
d5ee710f89 Fixed CSRF token checking in MediaController (broken by last 2 commits) 
* Also fixed getOwnerId(), no longer calls a non-existent function
 2015-01-22 12:20:13 -05:00
Albert Santoni
230cdcccb4 Merge branch '2.5.x' into cc-5709-airtime-analyzer 
Conflicts:
	CREDITS
 2015-01-22 11:29:38 -05:00
drigato
bade613e80 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage 
Conflicts:
	airtime_mvc/application/modules/rest/controllers/MediaController.php
 2015-01-22 11:19:25 -05:00
Duncan Sommerville
a40067ca55 Moved REST authorization boilerplate to Zend Acl_plugin 2015-01-21 17:20:04 -05:00
Duncan Sommerville
2c2f7ebc5f Initial commit for update to ACL for REST module; NEEDS TESTING 2015-01-21 15:34:15 -05:00
drigato
62f2a0babf CC-5981: Admin users can't delete webstreams created by other users 2015-01-21 11:31:28 -05:00
drigato
6ac5a2950f SAAS-551: Cannot schedule shows due to overlapping show check bug 2015-01-20 11:32:15 -05:00
Albert Santoni
0c3395289d Merge pull request #78 from Robbt/realtime-smart-blocks 
Added sort tracks by upload time to smart blocks criteria
 2015-01-19 15:36:28 -05:00
drigato
38882abd1a SAAS-542: ryerson.airtime.pro file doesn't play, preview, or download 2015-01-16 15:15:37 -05:00
drigato
527d2851af SAAS-542: ryerson.airtime.pro file doesn't play, preview, or download 2015-01-16 15:15:14 -05:00
Daniel James
cfe3527b93 Fix link to user manual 2015-01-15 16:33:03 +00:00
Albert Santoni
c4d3a8fa62 Massive simplification of the GeneralPreferences dialog 
* The purpose of this was so that we can use Zend_Form_Element
  decorators, which I need.
 2015-01-13 20:51:46 -05:00
Duncan Sommerville
a0e5c975dd Merge branch '2.5.x' of https://github.com/sourcefabric/Airtime into 2.5.x 2015-01-13 15:50:38 -05:00
drigato
2185fc9ca4 SAAS-536: Check for future scheduled files uses cloud_file id instead of cc_files id 2015-01-13 15:49:57 -05:00
Albert Santoni
caf37e1b87 CC-5975: Default fade-in/out, and crossfade time validators don't work 
* Fixed the number formatting and validation in the preferences and streaming preferences
  (the silly 00.5-style numbers are gone)
* Regex decmical validation of the default fade-in, fade-out, and
  crossfade duration was totally broken (you could enter words and it would work). That's fixed now.
 2015-01-13 12:18:57 -05:00
Mark Lewis
17a577fbbb use is_numeric instead of is_int as values are strings 2015-01-09 13:02:25 -05:00
Mark Lewis
1b03bd7fbd use new var instaead of calling getShowListContent again 2015-01-09 13:02:25 -05:00
Mark Lewis
fc8e65944e added error checked for required params 2015-01-09 13:02:25 -05:00
Mark Lewis
1cc1f8a378 return error for missing instance_id on show-tracks action 2015-01-09 13:02:25 -05:00
Mark Lewis
174cf79d84 clean up shows endpoint, remove dependency on Show model 2015-01-09 13:02:25 -05:00
Mark Lewis
a27ca2f583 cleanup new HTTP apiendpoints, added HTTPHelper and getStartEndFromRequest and updated all controllers that called their own versions of this function 2015-01-09 13:02:25 -05:00
Mark Lewis
03dae5be2b fix spacing in ApiController 2015-01-09 13:01:43 -05:00
Mark Lewis
44b4faf6d9 added shows, show-schedules, show-preview, show-history-feed, item-history-feed endpoints to the HTTP api to be used via NewscoopAirtimePlugin 2015-01-09 13:01:42 -05:00
Albert Santoni
05c9e21e48 Recognize audio/aac as a MIME type for webstreams 2015-01-09 10:44:24 -05:00
drigato
8d914bcd13 SAAS-529: Replace Apache Libcloud with Python-Boto SDK 2015-01-06 15:44:34 -05:00
drigato
cdabbc6648 SAAS-527: Allow files to be uploaded to either the cloud or on local file storage 
Done.
 2014-12-17 13:11:11 -05:00
drigato
6e2f07f875 Merge branch 'cc-5709-airtime-analyzer-cloud-storage' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-cloud-storage 2014-12-16 18:47:55 -05:00
drigato
1de326283e SAAS-527: Allow files to be uploaded to either the cloud or on local file storage 
Not quite done.
 2014-12-16 18:47:42 -05:00
Albert Santoni
7059820ca0 Add a comment about the proxy pattern 2014-12-16 14:54:53 -05:00
drigato
ff0a685243 Updated propel models 2014-12-16 14:20:28 -05:00
drigato
2af14e099b SAAS-519: webstreams not being deleted 2014-12-15 12:49:13 -05:00
drigato
d73b331376 SAAS-515: Prefix object names with station name 2014-12-10 12:40:08 -05:00
drigato
644e6b00d8 SAAS-516: Replace Zend_Service_Amazon_S3 with AWS SDK for PHP 2014-12-09 17:58:36 -05:00
drigato
ec189fc27a SAAS-509: PYPO can't download files via the REST API 2014-12-08 15:33:02 -05:00
drigato
59ceb11f00 SAAS-510: PYPO -> Files are downloaded even if they already exist in tmp cache dir 2014-12-08 13:21:24 -05:00
drigato
16dc286420 SAAS-503: PYPO -> Use the REST API to download files 2014-12-03 13:22:52 -05:00
drigato
e1f1807f5a SAAS-503: PYPO -> Use the REST API to download files 
Removed Amazon S3 specific code
 2014-12-02 18:46:17 -05:00
drigato
bf91677f91 SAAS-505: Extract Amazon_S3 class and have it inherit from a general 'cloud backend' class 
Fixed reading credentials in from cloud_storage.conf
 2014-12-02 09:06:28 -05:00
drigato
7c0a25be7f SAAS-505: Extract Amazon_S3 class and have it inherit from a general 'cloud backend' class 2014-12-01 21:05:46 -05:00
drigato
432245b18e SAAS-502: Analyzer -> Set the station id and domain in the cloud object's metadata 
Set the domain name in the cloud object's metadata
 2014-11-27 16:54:22 -05:00
drigato
92feacd46f SAAS-501: Re-jig cloud_storage.conf 2014-11-27 15:50:40 -05:00
drigato
8601452c71 Merge conflict 2014-11-27 15:46:39 -05:00
drigato
2f9382679a Merge branch 'cc-5709-airtime-analyzer-cloud-storage' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-cloud-storage 2014-11-27 15:45:26 -05:00
drigato
6cb993cc80 SAAS-504: Store provider in db 2014-11-27 15:44:53 -05:00
drigato
e59cd11370 Close the session when a track is previewed or downloaded. 
Close the file pointer when we are down with it.
 2014-11-27 13:48:34 -05:00
Albert Santoni
670a63df87 Error handling for if propel isn't found / composer wasn't run 2014-11-26 18:04:46 -05:00
Albert Santoni
8fbe7dd649 Report an error and die if amazon.conf is missing 2014-11-26 17:50:59 -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
drigato
f08535cc10 Merge branch '2.5.x' into cc-5709-airtime-analyzer 
Conflicts:
	airtime_mvc/application/Bootstrap.php
 2014-11-26 10:35:48 -05:00