Merge branch '2016.11-develop' into 2017.02
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 27 Jun 2017 11:54:15 +0000 (13:54 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 27 Jun 2017 11:54:15 +0000 (13:54 +0200)
Change-Id: I2344be996d4681f8b8c39d4167d8a9e7837a9b14

1  2 
tests/tine20/Tinebase/ApplicationTest.php
tine20/Addressbook/js/ContactGrid.js
tine20/Calendar/Frontend/WebDAV/Container.php
tine20/Felamimail/Config.php
tine20/Felamimail/Controller/Message/Send.php
tine20/Timetracker/Frontend/Json.php
tine20/Tinebase/Config.php
tine20/Tinebase/Container.php
tine20/Tinebase/Preference/Abstract.php
tine20/Tinebase/WebDav/Container/Abstract.php

Simple merge
@@@ -183,16 -189,28 +197,38 @@@ class Felamimail_Config extends Tinebas
              'setBySetupModule'      => TRUE,
              'default'               => null,
          ),
 -        )
 +        self::IMAP_ALLOW_SELF_SIGNED_TLS_CERT => array(
 +            //_('Allow self signed TLS cert for IMAP connection')
 +            'label'                 => 'Allow self signed TLS cert for IMAP connection',
 +            'description'           => '',
 +            'type'                  => Tinebase_Config_Abstract::TYPE_BOOL,
 +            'clientRegistryInclude' => FALSE,
 +            'setByAdminModule'      => FALSE,
 +            'setBySetupModule'      => TRUE,
 +            'default'               => false,
 +        ),
+         self::SIEVE_REDIRECT_ONLY_INTERNAL => array(
+             //_('Sieve Redirect Only Internal')
+             'label'                 => 'Sieve Redirect Only Internal',
+             // _('Allow only sieve redirect rules to internal (primary/secondary) email addresses')
+             'description'           => 'Allow only sieve redirect rules to internal (primary/secondary) email addresses',
+             'type'                  => Tinebase_Config_Abstract::TYPE_BOOL,
+             'clientRegistryInclude' => true,
+             'setByAdminModule'      => true,
+             'setBySetupModule'      => false,
+             'default'               => false,
+         ),
+         self::SIEVE_ADMIN_BOUNCE_NOTIFICATION_EMAIL => array(
+             //_('Sieve Notification Bounces Reporting Email')
+             'label'                 => 'Sieve Notification Bounces Reporting Email',
+             // _('Sieve Notification Bounces Reporting Email')
+             'description'           => 'Sieve Notification Bounces Reporting Email',
+             'type'                  => Tinebase_Config_Abstract::TYPE_STRING,
+             'clientRegistryInclude' => false,
+             'setByAdminModule'      => true,
+             'setBySetupModule'      => false,
+             'default'               => null,
++        ),
      );
      
      /**
Simple merge
@@@ -1440,18 -1462,18 +1469,29 @@@ class Tinebase_Config extends Tinebase_
              'setByAdminModule'      => FALSE,
              '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',
+             //_('Path to custom favicon.')
+             'description' => 'Define currency symbol to be used.',
+             'type' => 'string',
+             'default' => '€',
+             'clientRegistryInclude' => true,
+             'setByAdminModule' => false,
+             'setBySetupModule' => false,
+         ),
          self::FILESYSTEM => array(
              //_('Filesystem settings')
              'label'                 => 'Filesystem settings',
Simple merge