Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,429 Commits 3 Branches 0 Tags 405 MiB
Commit Graph

186 Commits

Author SHA1 Message Date
Duncan Sommerville 766f649f56 Merge branch 'saas-dashboard-provisioning' into saas 2015-03-19 11:59:01 -04:00
Duncan Sommerville 716244011a Removed unnecessary conditional around /provisioning/change in Bootstrap 2015-03-10 13:20:11 -04:00
Duncan Sommerville e2054c13c8 Added provisioning code for change requests 2015-03-03 16:04:45 -05:00
Duncan Sommerville 95db8533b5 Made provisioning helper slightly more robust 2015-03-03 15:29:34 -05:00
Albert Santoni ab6d83f49d Merge branch 'saas' into saas-media-refactor 
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/modules/rest/controllers/MediaController.php
 2015-02-26 13:10:13 -05:00
Duncan Sommerville 93f62eaadd Added check to hide LiveChat for existing hobbyist users 2015-02-26 12:49:52 -05:00
Albert Santoni 3a1141d4c8 Merge branch 'saas' into saas-media-refactor 
Conflicts:
	airtime_mvc/application/cloud_storage/ProxyStorageBackend.php
	airtime_mvc/application/controllers/ApiController.php
 2015-02-25 13:02:11 -05:00
Albert Santoni c0db309e32 Merge branch 'cc-5709-airtime-analyzer-refactor' into saas-media-refactor 
Conflicts:
	airtime_mvc/application/controllers/plugins/Acl_plugin.php
 2015-02-24 11:18:49 -05:00
Albert Santoni e2130df51c Merge branch 'cc-5709-airtime-analyzer-csrf' into cc-5709-airtime-analyzer 2015-02-24 11:15:27 -05:00
Duncan Sommerville be7cae4408 Fixed CSRF prevention checks for REST calls, moved CSRF initialization to Bootstrap 2015-02-20 13:12:49 -05:00
Albert Santoni 6d00da89db Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer 
Conflicts:
	airtime_mvc/application/models/airtime/CcFiles.php
	airtime_mvc/application/modules/rest/controllers/MediaController.php
 2015-02-20 11:14:11 -05:00
Albert Santoni b76ab27230 Fixed the unit tests: Ensure key in $_SERVER exists. 2015-02-18 17:03:16 -05:00
Albert Santoni 964d7d1326 Merge branch 'cc-5709-airtime-analyzer' into saas 
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/modules/rest/controllers/MediaController.php
 2015-02-18 16:42:04 -05:00
Albert Santoni dcac7ab652 Fixed a couple of bugs in the new /provisioning/create API 2015-02-18 12:21:15 -05:00
Duncan Sommerville a07a1edcc0 SAAS-595 - Updated validation and sanitization 2015-02-17 12:17:49 -05:00
Albert Santoni e603597101 Cleanup and comments 2015-02-17 12:13:37 -05:00
Duncan Sommerville ad5536dedd SAAS-582 - Added provisioning class to create database from within Airtime 2015-02-12 15:39:22 -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 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
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
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
Albert Santoni 797bafa453 Make the LiveChat changes from yesterday slightly more reslient to 
missing database keys.
 2014-12-12 11:57:16 -05:00
Albert Santoni ad56d6cafb Show the plan and station URL in Live Chat 2014-12-11 17:40:34 -05:00
drigato 57868d2351 Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas 2014-12-10 12:47:22 -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 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
Albert Santoni 670a63df87 Error handling for if propel isn't found / composer wasn't run 2014-11-26 18:04:46 -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 af8c6c2f48 Merged 2.5.x into saas 2014-11-10 09:08:03 -05:00
Duncan Sommerville efd05c4b77 Added the _initTranslationGlobals function to bind PHP globals to javascript vars for dynamic translation purposes 2014-11-06 18:40:06 -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 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
Duncan Sommerville afffd0c876 Added requires for REST controllers to Bootstrap 2014-09-16 18:04:22 -04:00
Albert Santoni 142060d600 Merge remote-tracking branch 'origin/2.5.x' into saas 2014-09-08 20:47:38 -04:00
Albert Santoni 4c1e6d3fe3 Fixed base URL 
Conflicts:
	airtime_mvc/application/controllers/LocaleController.php
 2014-09-04 17:09:09 -04:00
drigato b38f3d7e03 CC-5895: Upgrade Propel to 1.7 
Add vendor directory to include path
 2014-07-23 16:13:55 -04:00
drigato 7490c81a8f CC-5895: Upgrade Propel to 1.7 
Moved composer.json to top level of repo so propel will get installed there
Updated install scripts to reflect this change
 2014-07-23 15:56:23 -04:00
drigato 72841de714 CC-5895: Upgrade Propel to 1.7 
Used composer to download Propel 1.7
The Propel library will no longer be stored in the Airtime repo
 2014-07-23 15:03:51 -04:00
Albert Santoni 1aa99e2896 Merge branch '2.5.x' into cc-5709-airtime-analyzer 
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po
	airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po
	airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po
 2014-07-15 16:41:29 -04:00
Albert Santoni 2750b6aa0b Fixed unit tests in saas branch 2014-07-07 15:30:18 -04:00
Albert Santoni 4157c21b28 Merge branch '2.5.x' into saas 2014-06-25 11:25:50 -04:00
Albert Santoni 6c11ef2769 Even better fix, fixes unit tests too 2014-06-25 11:24:19 -04:00
Albert Santoni bb21f08d87 Merge branch '2.5.x' into saas 
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/models/Auth.php
 2014-06-25 11:18:56 -04:00