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

1  2 
tine20/Setup/js/AuthenticationPanel.js

@@@ -603,10 -597,10 +603,10 @@@ Tine.Setup.AuthenticationPanel = Ext.ex
                  value: '1'
              }, commonComboConfig),
              Ext.applyIf({
 -                name: 'accounts_' + type + 'useStartTls',
 +                name: 'accounts_' + type + '_useStartTls',
                  fieldLabel: this.app.i18n._('Start TLS'),
 -                store: [['0', this.app.i18n._('No')], ['1', this.app.i18n._('Yes')]],
 -                value: '0'
 +                store: [['1', this.app.i18n._('Yes')], ['0', this.app.i18n._('No')]],
-                 value: '0'
++                value: '1'
              }, commonComboConfig),
              Ext.applyIf({
                  hidden: type === 'ActiveDirectory' ,