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

2296 commits

Author SHA1 Message Date
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
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
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
66b97158b7 Make API on by default - fix 2014-09-19 15:30:06 -04:00
Duncan Sommerville
365184c2b1 Merging upstream pull 2014-09-19 13:15:53 -04:00
Duncan Sommerville
9952c2b58f Auto generated schema file updates 2014-09-19 13:03:09 -04:00
Duncan Sommerville
2630d88a03 Updated SQL queries to include instance descriptions for API calls 2014-09-19 13:00:44 -04:00
Duncan Sommerville
be90839dbe Added description field to database calls for getting API information 2014-09-18 18:21:27 -04:00
Duncan Sommerville
17ea198ea4 Added accessor function for Show image path 2014-09-17 19:49:22 -04:00
Duncan Sommerville
3f754c032a Updated Show model to include show image path 2014-09-16 18:28:39 -04:00
Duncan Sommerville
8494f813ee Updated sql schema to include image_path in Cc_Show table 2014-09-16 18:13:46 -04:00
Duncan Sommerville
cb80423fdd Work on adding image upload to add-show form 2014-09-12 18:05:24 -04:00
drigato
ac60a927d4 Merge branch '2.5.x' into saas 2014-09-12 16:31:58 -04:00
drigato
2729202dc4 Corrected japanese locale from ja to ja_JP 2014-09-12 16:29:47 -04:00
Albert Santoni
2a96c6ec5b Merge branch '2.5.x' into saas 2014-09-08 20:49:55 -04:00
Albert Santoni
f7b6e3379e Enable Japanese locale 2014-09-08 20:49:08 -04:00
drigato
52f3ed816e Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer 
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/plugins/Acl_plugin.php
 2014-08-28 12:01:42 -04:00
drigato
9fe0830dfd Merge branch '2.5.x' into cc-5709-airtime-analyzer 
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/LoginController.php
	airtime_mvc/application/controllers/plugins/Acl_plugin.php
 2014-08-28 11:59:41 -04:00
Albert Santoni
716cc5a754 Disable the APC cache for Ubuntu 14.04. APC is deprecated now so we need a better solution anyways. 2014-08-27 18:51:06 -04:00
Albert Santoni
77ff4ffc3a Merge branch '2.5.x' into saas 2014-08-26 13:34:09 -04:00
Albert Santoni
d1971b6d2b Remove cc_locale table and add Selenium running script 
* Fixes CC-5906
 2014-08-26 13:32:35 -04:00