Merge branch '2016.11' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 18 Jan 2017 16:38:19 +0000 (17:38 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 18 Jan 2017 16:38:19 +0000 (17:38 +0100)
12 files changed:
1  2 
tine20/Addressbook/Controller/Contact.php
tine20/Calendar/Backend/Sql.php
tine20/Calendar/Controller/Event.php
tine20/Filemanager/js/NodeTreePanel.js
tine20/Tinebase/Auth/CredentialCache.php
tine20/Tinebase/Config.php
tine20/Tinebase/Container.php
tine20/Tinebase/Frontend/Json/Container.php
tine20/Tinebase/Setup/Update/Release9.php
tine20/Tinebase/WebDav/Container/Abstract.php
tine20/Tinebase/js/widgets/container/ContainerSelect.js
tine20/Tinebase/js/widgets/grid/GridPanel.js

Simple merge
Simple merge
Simple merge
Simple merge
@@@ -93,10 -94,9 +97,10 @@@ Tine.widgets.container.selectionComboBo
      stateful: true,
      stateEvents: ['select'],
      
-     mode: 'local',
+     mode: 'remote',
      valueField: 'id',
      displayField: 'name',
 +    treePanelClass: Tine.widgets.container.TreePanel,
      
      /**
       * is set to true if subpanels (selectionDialog) are active