Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch '2.5.x-albertenhancements' into saas

Browse source 
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
This commit is contained in:
Albert Santoni 2015-01-15 16:32:29 -05:00
commit 7c28b66ce9
20 changed files with 54 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

5
airtime_mvc/public/js/airtime/preferences/preferences.js
View file

@ -120,7 +120,8 @@ $(document).ready(function() {
$(this).toggleClass("closed");
return false;
}).next().hide();
/* No longer using AJAX for this form. Zend + our code makes it needlessly hard to deal with. -- Albert
$('#pref_save').live('click', function() {
var data = $('#pref_form').serialize();
var url = baseUrl+'Preference/index';
@ -133,7 +134,7 @@ $(document).ready(function() {
setConfigureMailServerListener();
setEnableSystemEmailsListener();
});
});
});*/
showErrorSections();