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
..
common	Merge branch '2.5.x' into saas-pullreq77	2015-01-09 13:10:54 -05:00
configs	Merge branch '2.5.x-albertenhancements' into saas	2015-01-15 16:32:29 -05:00
controllers	Merge branch '2.5.x-albertenhancements' into saas	2015-01-15 16:32:29 -05:00
forms	Merge branch '2.5.x-albertenhancements' into saas	2015-01-15 16:32:29 -05:00
layouts/scripts	Merge branch '2.5.x' into saas	2015-01-13 21:31:57 -05:00
logging	CC-5062:	2013-04-19 20:11:33 -04:00
models	Merge branch '2.5.x' into saas	2015-01-13 21:31:57 -05:00
modules/rest	Merge branch 'cc-5709-airtime-analyzer' into saas	2014-11-20 16:47:35 -05:00
services	Merge branch '2.5.x' into saas-pullreq77	2015-01-09 13:10:54 -05:00
upgrade	Updated upgrade functions to have a directory parameter, since __DIR__	2014-09-19 12:58:31 -04:00
validate	Fix SAAS-349 by preventing password changes in demo mode.	2013-09-26 16:23:22 -04:00
views	Merge branch '2.5.x-albertenhancements' into saas	2015-01-15 16:32:29 -05:00
Bootstrap.php	Merge branch '2.5.x' into saas	2015-01-13 21:31:57 -05:00