Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 31 Jan 2017 14:51:17 +0000 (15:51 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 31 Jan 2017 14:51:17 +0000 (15:51 +0100)
1  2 
tests/tine20/Crm/JsonTest.php
tests/tine20/Felamimail/Frontend/JsonTest.php
tine20/Calendar/Model/Rrule.php
tine20/Setup/Frontend/Cli.php
tine20/Tinebase/Container.php
tine20/Tinebase/Frontend/Cli.php
tine20/Tinebase/Import/Abstract.php
tine20/Tinebase/Relations.php
tine20/Tinebase/User/Abstract.php
tine20/Tinebase/js/ExceptionHandler.js

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -163,13 -163,12 +163,12 @@@ Tine.Tinebase.ExceptionHandler = functi
          switch (exception.code) {
              // not authorised
              case 401:
-                 Tine.Tinebase.registry.remove('currentAccount');
                  Ext.MessageBox.show(Ext.apply(defaults, {
 -                    title: _('Authorisation Required'), 
 -                    msg: _('Your session timed out. You need to login again.'),
 +                    title: i18n._('Authorisation Required'),
 +                    msg: i18n._('Your session timed out. You need to login again.'),
                      fn: function() {
+                         Tine.Tinebase.registry.remove('currentAccount');
+                         
                          /*
                          // NOTE: this should be a password only longing box
                          //       as we can't handle user changes here!