Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 30 Mar 2016 13:10:06 +0000 (15:10 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 30 Mar 2016 13:10:06 +0000 (15:10 +0200)
Conflicts:
tine20/Tinebase/Config.php

Change-Id: I566fb9e763a6c869b95a217b9a1a0d59a7903d1d

1  2 
tine20/Addressbook/js/ContactSearchCombo.js
tine20/Addressbook/js/Model.js
tine20/Calendar/js/AttendeeGridPanel.js
tine20/Tinebase/Config.php
tine20/Tinebase/js/common.js

Simple merge
@@@ -91,13 -91,13 +91,20 @@@ class Tinebase_Config extends Tinebase_
      const FEATURE_SHOW_ADVANCED_SEARCH = 'featureShowAdvancedSearch';
  
      /**
 +     * FEATURE_CONTAINER_CUSTOM_SORT
 +     *
 +     * @var string
 +     */
 +    const FEATURE_CONTAINER_CUSTOM_SORT = 'featureContainerCustomSort';
 +
 +    /**
+      * FEATURE_SHOW_ACCOUNT_EMAIL
+      *
+      * @var string
+      */
+     const FEATURE_SHOW_ACCOUNT_EMAIL = 'featureShowAccountEmail';
+     /**
       * user defined page title postfix for browser page title
       * 
       * @var string
                      'description'   => 'Show toggle button to switch on or off the advanced search for the quickfilter',
                      //_('Show toggle button to switch on or off the advanced search for the quickfilter')
                  ),
 +                self::FEATURE_CONTAINER_CUSTOM_SORT => array(
 +                    'label'         => 'Container Custom Sort', //_('Container Custom Sort')
 +                    '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_SHOW_ADVANCED_SEARCH  => false,
 +                self::FEATURE_CONTAINER_CUSTOM_SORT => false,
+                 self::FEATURE_SHOW_ACCOUNT_EMAIL => false,
              ),
          ),
          self::CRONUSERID => array(
Simple merge