Merge branch '2015.11-develop' into 2016.03
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 5 Apr 2016 14:09:05 +0000 (16:09 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 5 Apr 2016 14:09:05 +0000 (16:09 +0200)
Conflicts:
tine20/Tinebase/Config.php
tine20/library/Zend/Locale/Format.php

Change-Id: I504a52e41632f81ddd76668885dc2c2161a1feda

1  2 
tests/tine20/Addressbook/JsonTest.php
tine20/Tinebase/Config.php
tine20/composer.json
tine20/composer.lock

Simple merge
@@@ -473,10 -480,16 +480,16 @@@ class Tinebase_Config extends Tinebase_
                      'description'   => 'Allows to sort containers by setting the sort order in Admin/Container',
                      //_('Allows to sort containers by setting the sort order in Admin/Container')
                  ),
+                 self::FEATURE_SHOW_ACCOUNT_EMAIL => array(
+                     'label'         => 'Show Account Email Address', //_('Show Account Email Address')
+                     'description'   => 'Show email address in account picker and attendee grids',
+                     //_('Show email address in account picker and attendee grids')
+                 ),
              ),
              'default'               => array(
 -                self::FEATURE_SHOW_ADVANCED_SEARCH  => false,
 -                self::FEATURE_CONTAINER_CUSTOM_SORT => false,
 -                self::FEATURE_SHOW_ACCOUNT_EMAIL => false,
 +                self::FEATURE_SHOW_ADVANCED_SEARCH  => true,
 +                self::FEATURE_CONTAINER_CUSTOM_SORT => true,
++                self::FEATURE_SHOW_ACCOUNT_EMAIL => true,
              ),
          ),
          self::CRONUSERID => array(
@@@ -23,9 -28,9 +23,9 @@@
          "phpoffice/phpword": "0.12.*",
          "sabre/dav": "1.8.*",
          "sabre/vobject": "3.1.3 as 2.1.313",
-         "metaways/opendocument": "1.0",
+         "metaways/opendocument": "1.1",
          "metaways/timezoneconvert": "0.2",
 -        "zendframework/zend-http": "2.2.8-p3 as 2.2.8"
 +        "zendframework/zend-http": "2.4.*"
      },
      "require-dev": {
          "phpunit/phpunit": "3.7.*",
Simple merge