Merge branch '2016.11-develop' into 2017.02
[tine20] / tine20 / Tinebase / Config.php
index 5a8c589..ef42f37 100644 (file)
@@ -493,6 +493,13 @@ class Tinebase_Config extends Tinebase_Config_Abstract
     const VERSION_CHECK = 'versionCheck';
 
     /**
+     * WEBDAV_SYNCTOKEN_ENABLED
+     *
+     * @var string
+     */
+    const WEBDAV_SYNCTOKEN_ENABLED = 'webdavSynctokenEnabled';
+
+    /**
      * @var string
      */
     const REPLICATION_MASTER = 'replicationMaster';
@@ -1535,6 +1542,17 @@ class Tinebase_Config extends Tinebase_Config_Abstract
             'setBySetupModule'      => FALSE,
             'default'               => NULL,
         ),
+        self::WEBDAV_SYNCTOKEN_ENABLED => array(
+        //_('Enable SyncToken plugin')
+            'label'                 => 'Enable SyncToken plugin',
+        //_('Enable the use of the SyncToken plugin.')
+            'description'           => 'Enable the use of the SyncToken plugin.',
+            'type'                  => 'bool',
+            'clientRegistryInclude' => FALSE,
+            'setByAdminModule'      => FALSE,
+            'setBySetupModule'      => FALSE,
+            'default'               => TRUE,
+        ),
         self::CURRENCY_SYMBOL => array(
             //_('currency symbol')
             'label' => 'urrency symbol',