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

288 commits

Author SHA1 Message Date
Albert Santoni
2a9790adf3 Backport ACL REST permission fix 2015-02-06 16:05:51 -05:00
drigato
cee0ff4881 SAAS-560: Deploy separate cloud storage config files for each development environment 
Default to production config files if dev env specific files are not
found.
Fix analyzer unit tests.
 2015-02-05 14:31:20 -05:00
drigato
e2ff452b8a Merge branch 'saas' into saas-cloud-storage-config-per-dev-env 2015-02-05 10:15:48 -05:00
Duncan Sommerville
826ae17552 SAAS-580 - Fixed routing issue causing show art to not upload; changed ShowController to be more RESTful 2015-02-04 15:09:27 -05:00
drigato
c6fc184559 Merge branch 'saas' into saas-cloud-storage-config-per-dev-env 
Conflicts:

python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py

python_apps/airtime_analyzer/airtime_analyzer/cloud_storage_uploader.py

python_apps/airtime_analyzer/airtime_analyzer/message_listener.py
 2015-02-04 13:36:35 -05:00
drigato
7b3f9af04c SAAS-560: Deploy separate cloud storage config files for each development environment 
Changed analyzer upstart to take the cloud storage config file as a command line option
Dropped the dev env portion from the rabbitmq-analyzer.ini filename
 2015-02-03 15:55:47 -05:00
Albert Santoni
f69e5afbff SAAS-576: Fixed the Sentry data sanitizer and moved DSN into a config file 2015-02-02 14:42:20 -05:00
drigato
5040eb498d SAAS-560: Deploy separate cloud storage config files for each development environment 2015-02-02 12:54:56 -05:00
drigato
ca9750f415 Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas 
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/configs/ACL.php
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/controllers/plugins/Acl_plugin.php
	airtime_mvc/application/forms/GeneralPreferences.php
	airtime_mvc/application/modules/rest/controllers/MediaController.php
	airtime_mvc/application/views/scripts/form/preferences_general.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
	airtime_mvc/build/sql/schema.sql
 2015-01-23 11:32:45 -05:00
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
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
2c2f7ebc5f Initial commit for update to ACL for REST module; NEEDS TESTING 2015-01-21 15:34:15 -05:00
Duncan Sommerville
c5a60d2f09 Last updates before 2.5.2 RC, mainly small fixes for Ubuntu Precise 2015-01-19 15:05:13 -05:00
Albert Santoni
c03dd38c00 Merge branch '2.5.x' into 2.5.x-installer 
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/models/Show.php
 2015-01-16 17:27:52 -05:00
Duncan Sommerville
44018b2cbf Changed status page to use config-check (tentative) and removed time-intensive check in index routing 2015-01-16 16:15:16 -05:00
Duncan Sommerville
36c889a3a2 Merge branch '2.5.x-installer' of https://github.com/sourcefabric/Airtime into 2.5.x-installer 2015-01-15 17:34:33 -05:00
Duncan Sommerville
791466b023 Fixes for code review https://github.com/sourcefabric/Airtime/pull/84 2015-01-15 16:33:33 -05:00
Albert Santoni
11acca32f9 Update comment at the top of conf.php to reflect config file 
amalgamation
 2015-01-15 15:36:22 -05:00
Albert Santoni
ee9163fa8e 2.5.2: Reorganize upgrade path so that 2.5.2 contains the show art schema changes 
* Also bump the system_version number to 2.5.2. This will be deprecated sooner or later...
 2015-01-15 12:42:36 -05:00
Daniel James
cfe3527b93 Fix link to user manual 2015-01-15 16:33:03 +00:00
Duncan Sommerville
5e22f929c7 Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
Duncan Sommerville
df2576e5a0 Updated installer to better accommodate running over existing installs 2015-01-14 16:11:49 -05:00
drigato
d99147bad4 Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas 2015-01-13 14:23:51 -05:00
Duncan Sommerville
1ddda846d6 Updates to running background services as web user 2015-01-08 18:52:58 -05:00
Duncan Sommerville
f4c5cf1353 Added virtualenv back into install process 2015-01-05 16:41:03 -05:00
Duncan Sommerville
9c324c1b6f Updated configuration checklist 2014-12-19 11:58:47 -05:00
Duncan Sommerville
32f40f3dc8 Updated configuration checklist to include running services 2014-12-19 11:44:23 -05:00
Albert Santoni
a0f5e33855 Added "Help Center" link to Help menu for Josh 2014-12-17 16:10:04 -05:00
drigato
ec1c8669c8 Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas 2014-12-17 14:14:03 -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
Duncan Sommerville
4043ebfd25 More work on monitless installer 2014-12-16 16:26:58 -05:00
drigato
ff0a685243 Updated propel models 2014-12-16 14:20:28 -05:00
Duncan Sommerville
4dfd49d12c Initial work on monitless installation 2014-12-16 12:24:41 -05:00
drigato
09c30bde1b Regenerated Propel models because some fields and methods were missing. 2014-12-16 10:53:39 -05:00
Duncan Sommerville
8f99595f54 Added button to redirect to login page from config-check page on success 2014-12-15 09:49:00 -05:00
drigato
891cfdb48e SAAS-517: Create Provisioning controller with a terminate endpoint 2014-12-11 13:35:34 -05:00
Duncan Sommerville
f5b4928538 More work on web installer 2014-12-09 17:48:16 -05:00
Duncan Sommerville
9fed113f74 More work on setup/installation process 2014-12-03 18:04:47 -05:00
drigato
cf9eabbc74 Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas 
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/modules/rest/controllers/MediaController.php
	airtime_mvc/build/sql/schema.sql
	python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
 2014-12-03 13:35:32 -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
Duncan Sommerville
acaf47c592 More work on web setup form 2014-12-01 15:49:53 -05:00
Duncan Sommerville
8f46b4dca7 More work on new installer 2014-11-28 15:30:11 -05:00
drigato
8601452c71 Merge conflict 2014-11-27 15:46:39 -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
drigato
bec62ec906 SAAS-496: Create a provisioning controller with a terminate endpoint 2014-11-25 16:04:08 -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