Merge remote-tracking branch 'origin/develop'

2015-12-30 15:47:00 -08:00
parent 8eb31a9a82 7c06cba647
commit 2f4e54c8a6
323 changed files with 5631 additions and 880 deletions
@@ -155,6 +155,7 @@ class SettingsController extends AdminController
            $setting->slack_botname = e(Input::get('slack_botname'));
            $setting->ldap_enabled = Input::get('ldap_enabled', '0');
            $setting->ldap_server = Input::get('ldap_server');
+            $setting->ldap_server_cert_ignore = Input::get('ldap_server_cert_ignore', false);
            $setting->ldap_uname = Input::get('ldap_uname');
            $setting->ldap_pword = Crypt::encrypt(Input::get('ldap_pword'));
            $setting->ldap_basedn = Input::get('ldap_basedn');