Merge branch '2014.11-develop' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 20 Jan 2016 14:41:52 +0000 (15:41 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 20 Jan 2016 14:41:52 +0000 (15:41 +0100)
Conflicts:
tine20/Calendar/Setup/Update/Release8.php
tine20/Calendar/Setup/setup.xml

Change-Id: I0e9f8458c1ab9a40b7390b46ad8a2ec8e4da7c8a

1  2 
tests/tine20/Calendar/Frontend/ActiveSyncTest.php
tests/tine20/Felamimail/Frontend/ActiveSyncTest.php
tests/tine20/Tinebase/AllTests.php
tests/tine20/Tinebase/User/LdapTest.php
tine20/Calendar/Controller/Event.php
tine20/Calendar/Setup/Update/Release8.php
tine20/Calendar/Setup/Update/Release9.php
tine20/Calendar/Setup/setup.xml
tine20/Setup/Frontend/Cli.php
tine20/Tinebase/Relations.php

Simple merge
Simple merge
@@@ -501,6 -502,16 +502,24 @@@ class Calendar_Setup_Update_Release8 ex
       */
      public function update_11()
      {
+         $deviceBackend = new ActiveSync_Backend_Device();
+         $usersWithiPhones = $deviceBackend->search(new ActiveSync_Model_DeviceFilter(array(
+             'devicetype' => 'iphone'
+         )), NULL, 'owner_id');
+         $activeSyncController = ActiveSync_Controller::getInstance();
+         foreach($usersWithiPhones as $userId) {
+             $activeSyncController->resetSyncForUser($userId, 'Calendar');
+         }
+         $this->setApplicationVersion('Calendar', '8.12');
+     }
++
++    /**
++     * update to 9.0
++     */
++    public function update_12()
++    {
 +        $this->setApplicationVersion('Calendar', '9.0');
 +    }
  }
index 4ef5b79,0000000..4b7bd20
mode 100644,000000..100644
--- /dev/null
@@@ -1,53 -1,0 +1,63 @@@
 +<?php
 +/**
 + * Tine 2.0
 + *
 + * @package     Calendar
 + * @subpackage  Setup
 + * @license     http://www.gnu.org/licenses/agpl.html AGPL3
 + * @copyright   Copyright (c) 2015 Metaways Infosystems GmbH (http://www.metaways.de)
 + * @author      Philipp Schüle <p.schuele@metaways.de>
 + */
 +class Calendar_Setup_Update_Release9 extends Setup_Update_Abstract
 +{
 +    /**
 +     * update to 9.1
 +     * - identify base event via new base_event_id field instead of UID
 +     */
 +    public function update_0()
 +    {
 +        if ($this->getTableVersion('cal_events') < 10) {
 +            $release8 = new Calendar_Setup_Update_Release8($this->_backend);
 +            $release8->update_8();
 +        }
 +        $this->setApplicationVersion('Calendar', '9.1');
 +    }
 +
 +    /**
 +     * update to 9.2
 +     *
 +     * @see 0011266: increase size of event fields summary and location
 +     */
 +    public function update_1()
 +    {
 +        if ($this->getTableVersion('cal_events') < 11) {
 +            $release8 = new Calendar_Setup_Update_Release8($this->_backend);
 +            $release8->update_9();
 +        }
 +        $this->setApplicationVersion('Calendar', '9.2');
 +    }
 +
 +    /**
 +     * update to 9.3
 +     *
 +     * @see 0011312: Make resource notification handling and default status configurable
 +     */
 +    public function update_2()
 +    {
 +        if ($this->getTableVersion('cal_resources') < 3) {
 +            $release8 = new Calendar_Setup_Update_Release8($this->_backend);
 +            $release8->update_10();
 +        }
 +        $this->setApplicationVersion('Calendar', '9.3');
 +    }
++
++    /**
++     * force activesync calendar resync for iOS devices
++     */
++    public function update_3()
++    {
++        $release8 = new Calendar_Setup_Update_Release8($this->_backend);
++        $release8->update_11();
++        $this->setApplicationVersion('Calendar', '9.4');
++    }
 +}
@@@ -2,7 -2,7 +2,7 @@@
  <application>
      <name>Calendar</name>
      <!-- gettext('Calendar') -->   
-     <version>9.3</version>
 -    <version>8.12</version>
++    <version>9.4</version>
      <order>15</order>
      <status>enabled</status>
      <tables>
Simple merge
Simple merge