Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 4 May 2015 12:57:13 +0000 (14:57 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 4 May 2015 12:57:13 +0000 (14:57 +0200)
Conflicts:
tine20/Setup/js/AuthenticationPanel.js

Change-Id: Ib7d66926b11cfb6a12405dc2dbbb1b708d76e026

tine20/Setup/js/AuthenticationPanel.js

index a3cf7e4..35c5488 100644 (file)
@@ -4,7 +4,7 @@
  * @package     Setup
  * @license     http://www.gnu.org/licenses/agpl.html AGPL Version 3
  * @author      Cornelius Weiss <c.weiss@metaways.de>
- * @copyright   Copyright (c) 2009-2012 Metaways Infosystems GmbH (http://www.metaways.de)
+ * @copyright   Copyright (c) 2009-2015 Metaways Infosystems GmbH (http://www.metaways.de)
  *
  */
 
@@ -332,7 +332,7 @@ Tine.Setup.AuthenticationPanel = Ext.extend(Tine.Tinebase.widgets.form.ConfigPan
                         Ext.applyIf({
                             name: 'authentication_Ldap_useStartTls',
                             fieldLabel: this.app.i18n._('Start TLS'),
-                            store: [[['0', this.app.i18n._('No'), '1', this.app.i18n._('Yes')]]],
+                            store: [['0', this.app.i18n._('No')], ['1', this.app.i18n._('Yes')]],
                             value: '0'
                         }, commonComboConfig), 
                         {
@@ -606,7 +606,7 @@ Tine.Setup.AuthenticationPanel = Ext.extend(Tine.Tinebase.widgets.form.ConfigPan
                 name: 'accounts_' + type + '_useStartTls',
                 fieldLabel: this.app.i18n._('Start TLS'),
                 store: [['1', this.app.i18n._('Yes')], ['0', this.app.i18n._('No')]],
-                value: '0'
+                value: '1'
             }, commonComboConfig),
             Ext.applyIf({
                 hidden: type === 'ActiveDirectory' ,