Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 15 Sep 2016 08:14:01 +0000 (10:14 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 15 Sep 2016 08:14:01 +0000 (10:14 +0200)
Change-Id: I2e75d140ee646e5e8dc977d55deedc36f54d81c6

1  2 
tine20/Addressbook/Model/Contact.php
tine20/Filemanager/Frontend/Download.php
tine20/Tinebase/Config.php
tine20/Tinebase/js/MainScreen.js
tine20/composer.lock

Simple merge
@@@ -149,13 -143,10 +143,10 @@@ class Filemanager_Frontend_Download ext
       */
      protected function _displayFile(Filemanager_Model_DownloadLink $download, Tinebase_Model_Tree_Node $node, $path)
      {
-         $view = new Zend_View();
-         $view->setScriptPath('Filemanager/views');
-         
-         $view->path = '/' . implode('/', $path);
-         
+         $view = $this->_getView($path, $node);
          $view->file = $node;
 -        $view->file->path = '/download/get/' . $download->getId() . '/' . implode('/', $path);
 +        $view->file->path = $download->getDownloadUrl('get') . '/' . implode('/', $path);
          
          header('Content-Type: text/html; charset=utf-8');
          die($view->render('file.phtml'));
@@@ -373,22 -352,26 +373,32 @@@ class Tinebase_Config extends Tinebase_
      /**
       * maintenance mode
       *
--     * @var bool
++     * @var string
       */
      const MAINTENANCE_MODE = 'maintenanceMode';
  
      /**
--     * @var array of strings
++     * @var string
       */
      const FAT_CLIENT_CUSTOM_JS = 'fatClientCustomJS';
      
 +    const BRANDING_LOGO = 'branding_logo';
 +    const BRANDING_FAVICON = 'branding_favicon';
 +    const BRANDING_TITLE = 'branding_title';
 +    const BRANDING_WEBURL = 'branding_weburl';
 +    const BRANDING_DESCRIPTION = 'branding_description';
 +
      /**
 -     * @var boolean
++     * @var string
+      */
+     const USE_LOGINNAME_AS_FOLDERNAME = 'useLoginnameAsFoldername';
+     /**
 -     * @var array of strings
++     * @var string
+      */
+     const VERSION_CHECK = 'versionCheck';
+     /**
       * (non-PHPdoc)
       * @see tine20/Tinebase/Config/Definition::$_properties
       */
              'setByAdminModule'      => FALSE,
              'setBySetupModule'      => FALSE,
          ),
 -        )
 +        self::BRANDING_DESCRIPTION => array(
 +                //_('custom description')
 +                'label'                 => 'custom description',
 +                //_('Custom description for branding.')
 +                'description'           => 'Custom description for branding.',
 +                'type'                  => 'string',
 +                'default'               => '',
 +                'clientRegistryInclude' => FALSE,
 +                'setByAdminModule'      => FALSE,
 +                'setBySetupModule'      => FALSE,
 +        ),
 +        self::BRANDING_WEBURL => array(
 +                //_('custom weburl')
 +                'label'                 => 'custom weburl',
 +                //_('Custom weburl for branding.')
 +                'description'           => 'Custom weburl for branding.',
 +                'type'                  => 'string',
 +                'default'               => '',
 +                'clientRegistryInclude' => FALSE,
 +                'setByAdminModule'      => FALSE,
 +                'setBySetupModule'      => FALSE,
 +        ),
 +        self::BRANDING_TITLE => array(
 +                //_('custom title')
 +                'label'                 => 'custom title',
 +                //_('Custom title for branding.')
 +                'description'           => 'Custom ltitle for branding.',
 +                'type'                  => 'string',
 +                'default'               => '',
 +                'clientRegistryInclude' => FALSE,
 +                'setByAdminModule'      => FALSE,
 +                'setBySetupModule'      => FALSE,
 +        ),
 +        self::BRANDING_LOGO => array(
 +                //_('custom logo path')
 +                'label'                 => 'custom logo path',
 +                //_('Path to custom logo.')
 +                'description'           => 'Path to custom logo.',
 +                'type'                  => 'string',
 +                'default'               => '',
 +                'clientRegistryInclude' => FALSE,
 +                'setByAdminModule'      => FALSE,
 +                'setBySetupModule'      => FALSE,
 +        ),
 +        self::BRANDING_FAVICON => array(
 +                //_('custom favicon path')
 +                'label'                 => 'custom favicon path',
 +                //_('Path to custom favicon.')
 +                'description'           => 'Path to custom favicon.',
 +                'type'                  => 'string',
 +                'default'               => '',
 +                'clientRegistryInclude' => FALSE,
 +                'setByAdminModule'      => FALSE,
 +                'setBySetupModule'      => FALSE,
 +        ),
+         self::USE_LOGINNAME_AS_FOLDERNAME => array(
+         //_('Use login name instead of full name')
+             'label'                 => 'Use login name instead of full name',
+         //_('Use login name instead of full name for webdav.')
+             'description'           => 'Use login name instead of full name for webdav.',
+             'type'                  => 'bool',
+             'clientRegistryInclude' => FALSE,
+             'setByAdminModule'      => FALSE,
+             'setBySetupModule'      => FALSE,
+             'default'               => FALSE,
++        ),
      );
      
      /**
Simple merge
              "time": "2013-10-02 15:59:03"
          },
          {
 +            "name": "symfony/console",
 +            "version": "v2.8.2",
 +            "source": {
 +                "type": "git",
 +                "url": "https://github.com/symfony/console.git",
 +                "reference": "d0239fb42f98dd02e7d342f793c5d2cdee0c478d"
 +            },
 +            "dist": {
 +                "type": "zip",
 +                "url": "https://api.github.com/repos/symfony/console/zipball/d0239fb42f98dd02e7d342f793c5d2cdee0c478d",
 +                "reference": "d0239fb42f98dd02e7d342f793c5d2cdee0c478d",
 +                "shasum": ""
 +            },
 +            "require": {
 +                "php": ">=5.3.9",
 +                "symfony/polyfill-mbstring": "~1.0"
 +            },
 +            "require-dev": {
 +                "psr/log": "~1.0",
 +                "symfony/event-dispatcher": "~2.1|~3.0.0",
 +                "symfony/process": "~2.1|~3.0.0"
 +            },
 +            "suggest": {
 +                "psr/log": "For using the console logger",
 +                "symfony/event-dispatcher": "",
 +                "symfony/process": ""
 +            },
 +            "type": "library",
 +            "extra": {
 +                "branch-alias": {
 +                    "dev-master": "2.8-dev"
 +                }
 +            },
 +            "autoload": {
 +                "psr-4": {
 +                    "Symfony\\Component\\Console\\": ""
 +                },
 +                "exclude-from-classmap": [
 +                    "/Tests/"
 +                ]
 +            },
 +            "notification-url": "https://packagist.org/downloads/",
 +            "license": [
 +                "MIT"
 +            ],
 +            "authors": [
 +                {
 +                    "name": "Fabien Potencier",
 +                    "email": "fabien@symfony.com"
 +                },
 +                {
 +                    "name": "Symfony Community",
 +                    "homepage": "https://symfony.com/contributors"
 +                }
 +            ],
 +            "description": "Symfony Console Component",
 +            "homepage": "https://symfony.com",
 +            "time": "2016-01-14 08:33:16"
 +        },
 +        {
 +            "name": "symfony/polyfill-mbstring",
 +            "version": "v1.0.1",
 +            "source": {
 +                "type": "git",
 +                "url": "https://github.com/symfony/polyfill-mbstring.git",
 +                "reference": "49ff736bd5d41f45240cec77b44967d76e0c3d25"
 +            },
 +            "dist": {
 +                "type": "zip",
 +                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/49ff736bd5d41f45240cec77b44967d76e0c3d25",
 +                "reference": "49ff736bd5d41f45240cec77b44967d76e0c3d25",
 +                "shasum": ""
 +            },
 +            "require": {
 +                "php": ">=5.3.3"
 +            },
 +            "suggest": {
 +                "ext-mbstring": "For best performance"
 +            },
 +            "type": "library",
 +            "extra": {
 +                "branch-alias": {
 +                    "dev-master": "1.0-dev"
 +                }
 +            },
 +            "autoload": {
 +                "psr-4": {
 +                    "Symfony\\Polyfill\\Mbstring\\": ""
 +                },
 +                "files": [
 +                    "bootstrap.php"
 +                ]
 +            },
 +            "notification-url": "https://packagist.org/downloads/",
 +            "license": [
 +                "MIT"
 +            ],
 +            "authors": [
 +                {
 +                    "name": "Nicolas Grekas",
 +                    "email": "p@tchwork.com"
 +                },
 +                {
 +                    "name": "Symfony Community",
 +                    "homepage": "https://symfony.com/contributors"
 +                }
 +            ],
 +            "description": "Symfony polyfill for the Mbstring extension",
 +            "homepage": "https://symfony.com",
 +            "keywords": [
 +                "compatibility",
 +                "mbstring",
 +                "polyfill",
 +                "portable",
 +                "shim"
 +            ],
 +            "time": "2015-11-20 09:19:13"
 +        },
 +        {
              "name": "syncroton/syncroton",
-             "version": "1.2.1",
+             "version": "1.2.2",
              "source": {
                  "type": "git",
                  "url": "http://git.syncroton.org/Syncroton",