Merge branch '2014.11-develop' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 12 Aug 2015 15:08:18 +0000 (17:08 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 12 Aug 2015 15:08:18 +0000 (17:08 +0200)
Conflicts:
tine20/Calendar/Config.php

Change-Id: I18de2c91d8d975f08b61d58804f4f48f5b7ebe70

1  2 
tine20/Calendar/Config.php

@@@ -312,9 -301,8 +312,9 @@@ class Calendar_Config extends Tinebase_
                  ),
              ),
              'default'               => array(
-                 self::FEATURE_SPLIT_VIEW                        => false,
+                 self::FEATURE_SPLIT_VIEW                        => true,
 -                self::FEATURE_EXTENDED_EVENT_CONTEXT_ACTIONS    => false,
 +                self::FEATURE_YEAR_VIEW                         => true,
 +                self::FEATURE_EXTENDED_EVENT_CONTEXT_ACTIONS    => true,
              ),
          ),
      );