drigato 477ac337e5 Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas ... Conflicts: airtime_mvc/application/models/StoredFile.php python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py		2014-11-26 11:54:07 -05:00
..
amazon	code cleanup	2014-11-11 16:29:54 -05:00
common	Fix logins from WHMCS by disabling CSRF token on login page for trusted	2014-11-20 19:33:11 -05:00
configs	SAAS-496: Create a provisioning controller with a terminate endpoint	2014-11-25 16:04:08 -05:00
controllers	Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas	2014-11-26 11:54:07 -05:00
forms	Fix logins from WHMCS by disabling CSRF token on login page for trusted	2014-11-20 19:33:11 -05:00
layouts/scripts	Merged 2.5.x into saas	2014-11-10 09:08:03 -05:00
logging	CC-5062:	2013-04-19 20:11:33 -04:00
models	Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas	2014-11-26 11:54:07 -05:00
modules/rest	Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas	2014-11-26 11:54:07 -05:00
services	Merged 2.5.x into saas	2014-11-05 17:36:58 -05:00
upgrade	Fixed upgrades	2014-11-04 13:33:20 -05:00
validate	Fix SAAS-349 by preventing password changes in demo mode.	2013-09-26 16:23:22 -04:00
views	Merged 2.5.x into saas	2014-11-10 09:08:03 -05:00
Bootstrap.php	Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas	2014-11-18 09:24:38 -05:00