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

2018 commits

Author SHA1 Message Date
Albert Santoni
6e43505379 Merge branch '2.5.x' into 2.5.x-installer 2015-01-22 17:36:12 -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
Albert Santoni
fd42c67b0b Merge branch 'saas' of github.com:sourcefabric/Airtime into saas 2015-01-21 18:08:05 -05:00
Duncan Sommerville
7e2cc65f32 Merge branch '2.5.x' into saas 2015-01-21 15:15:58 -05:00
Duncan Sommerville
6492128ce9 Hide Now Playing toolbar for Guest users 2015-01-21 15:15:22 -05:00
Duncan Sommerville
345b2b5d26 Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas 2015-01-21 15:14:34 -05:00
drigato
2fadc8f8f1 Merge branch '2.5.x' into saas 
Conflicts:
	CREDITS
 2015-01-20 11:44:53 -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
75306936c0 Workaround for comment character conflict between python ConfigObj and PHP 2015-01-16 10:22:43 -05:00
Albert Santoni
620029c04e Stop Chrome from flashing white between page loads 2015-01-15 16:45:14 -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
7c28b66ce9 Merge branch '2.5.x-albertenhancements' into saas 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/forms/Preferences.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
 2015-01-15 16:32:29 -05:00
Albert Santoni
f9bf71a349 Moved the Station Logo field to GeneralPreferences, and stopped using 
AJAX on the general prefs form
 2015-01-15 16:28:18 -05:00
Duncan Sommerville
a5cc529c4a Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas 2015-01-15 11:24:16 -05:00
Duncan Sommerville
5e22f929c7 Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
Albert Santoni
d5b969f94f Merge branch '2.5.x' into saas 
Conflicts:
	airtime_mvc/application/forms/GeneralPreferences.php
	airtime_mvc/application/views/scripts/form/preferences_general.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
 2015-01-13 21:31:57 -05: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
drigato
d99147bad4 Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas 2015-01-13 14:23:51 -05:00
Duncan Sommerville
d07195f048 Rework redirect to config page at the end of the web install 2015-01-12 14:40:22 -05:00
Duncan Sommerville
23f33cd8da Reorder final setup steps 2015-01-12 13:41:39 -05:00
Duncan Sommerville
2b882cc313 Reorder final setup steps 2015-01-12 12:45:52 -05:00
Duncan Sommerville
0fcac545e6 For now, just prompt users to start background services at the end of the install process 2015-01-12 10:53:31 -05:00
Duncan Sommerville
f4c5cf1353 Added virtualenv back into install process 2015-01-05 16:41:03 -05:00
Duncan Sommerville
fc68dfa256 Fixed service execution calls 2015-01-05 11:16:58 -05:00
drigato
b094e59df3 SAAS-526: Change prefix from station name to station id 
Just seeing if we can get the hosting id from a function in the Billing Controller
 2014-12-17 15:39:18 -05:00
Duncan Sommerville
4dfd49d12c Initial work on monitless installation 2014-12-16 12:24:41 -05:00
Duncan Sommerville
b47f02d331 TODO 2014-12-15 09:53:50 -05:00
Duncan Sommerville
5f315abb79 Updated final install step 2014-12-15 09:52:10 -05:00
Albert Santoni
ad56d6cafb Show the plan and station URL in Live Chat 2014-12-11 17:40:34 -05:00
Duncan Sommerville
270e84e9d8 Updated db setup to catch PDOExceptions 2014-12-11 15:54:55 -05:00
Duncan Sommerville
5802603566 Added AirtimeDatabaseException class to handle error cases in database-setup 2014-12-11 12:57:21 -05:00
Duncan Sommerville
e338598a30 Try to create the stor directory in the default case 2014-12-11 12:56:07 -05:00
Duncan Sommerville
ccd515e7d6 Rewrote database-setup to use PDO and be overall more readable 2014-12-11 12:54:50 -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
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
Duncan Sommerville
0b77222013 More work on WordPress style installer 2014-11-27 19:10:23 -05:00
Duncan Sommerville
d2f41eb8be New files for install process 2014-11-27 18:48:03 -05:00
Duncan Sommerville
4a1354c45f Work on new WordPress style install process 2014-11-27 18:47:05 -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
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
Duncan Sommerville
6b8163748d Updated styles for csrf elements 2014-11-13 09:46:44 -05:00
Duncan Sommerville
785651ec4b Merged 2.5.x into 2.5.x-installer 2014-11-10 17:15:41 -05:00
Duncan Sommerville
af8c6c2f48 Merged 2.5.x into saas 2014-11-10 09:08:03 -05:00