Merge branch '2013.03' into 2013.10
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 27 Feb 2014 16:11:08 +0000 (17:11 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 27 Feb 2014 16:11:08 +0000 (17:11 +0100)
Conflicts:
tine20/Calendar/Config.php

1  2 
tests/tine20/Calendar/JsonTests.php
tine20/Calendar/Config.php
tine20/Setup/Frontend/Cli.php

Simple merge
@@@ -37,13 -37,20 +37,27 @@@ class Calendar_Config extends Tinebase_
      const ATTENDEE_ROLES = 'attendeeRoles';
      
      /**
 +     * MAX_FILTER_PERIOD_CALDAV
 +     * 
 +     * @var string
 +     */
 +    const MAX_FILTER_PERIOD_CALDAV = 'maxfilterperiodcaldav';
 +    
 +    /**
+      * MAX_JSON_DEFAULT_FILTER_PERIOD_FROM
+      * 
+      * @var string
+      */
+     const MAX_JSON_DEFAULT_FILTER_PERIOD_FROM = 'maxjsondefaultfilterperiodfrom';
+     
+     /**
+      * MAX_JSON_DEFAULT_FILTER_PERIOD_UNTIL
+      * 
+      * @var string
+      */
+     const MAX_JSON_DEFAULT_FILTER_PERIOD_UNTIL = 'maxjsondefaultfilterperioduntil';
+     
+     /**
       * (non-PHPdoc)
       * @see tine20/Tinebase/Config/Definition::$_properties
       */
              'clientRegistryInclude' => TRUE,
              'default'               => 'REQ'
          ),
 +        self::MAX_FILTER_PERIOD_CALDAV => array(
 +        //_('Filter timeslot for CalDAV events')
 +            'label'                 => 'Filter timeslot for events',
 +        //_('For how long in the past (in months) the events should be synchronized.')
 +            'description'           => 'For how long in the past (in months) the events should be synchronized.',
 +            'type'                  => Tinebase_Config_Abstract::TYPE_INT,
 +            'clientRegistryInclude' => FALSE,
 +            'setByAdminModule'      => FALSE,
 +            'setBySetupModule'      => TRUE,
 +            'default'               => 2,
 +        ),
+         self::MAX_JSON_DEFAULT_FILTER_PERIOD_FROM => array(
+         //_('Default filter period (from) for events fetched via JSON API')
+             'label'                 => 'Default filter period (from) for events fetched via JSON API',
+         //_('For how long in the past (in months) the events should be fetched.')
+             'description'           => 'For how long in the past (in months) the events should be fetched.',
+             'type'                  => Tinebase_Config_Abstract::TYPE_INT,
+             'clientRegistryInclude' => FALSE,
+             'setByAdminModule'      => FALSE,
+             'setBySetupModule'      => TRUE,
+             'default'               => 0,
+         ),
+         self::MAX_JSON_DEFAULT_FILTER_PERIOD_UNTIL => array(
+         //_('Default filter period (until) for events fetched via JSON API')
+             'label'                 => 'Default filter period (until) for events fetched via JSON API',
+         //_('For how long in the future (in months) the events should be fetched.')
+             'description'           => 'For how long in the future (in months) the events should be fetched.',
+             'type'                  => Tinebase_Config_Abstract::TYPE_INT,
+             'clientRegistryInclude' => FALSE,
+             'setByAdminModule'      => FALSE,
+             'setBySetupModule'      => TRUE,
+             'default'               => 1,
+         ),
      );
      
      /**
Simple merge