Merge branch '2014.11' into 2014.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 3 Feb 2016 14:13:43 +0000 (15:13 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 3 Feb 2016 14:13:43 +0000 (15:13 +0100)
Conflicts:
tine20/Tinebase/js/AppManager.js

Change-Id: If5701f14e8ac23ef81835bcb744ffe4fee119857

1  2 
tine20/Tinebase/js/AppManager.js

@@@ -272,12 -272,7 +272,12 @@@ Ext.extend(Tine.Tinebase.AppManager, Ex
              
          } catch(e) {
              console.error('Initialising of Application "' + app.appName + '" failed with the following message:' + e);
-             console.warn(e);
+             console.error(e.stack);
 +            if (! Tine[app.appName].registry) {
 +                // registry load problem: reload
 +                Tine.Tinebase.common.reload({});
 +            }
 +
              return false;
          }
      },