Merge branch '2016.11' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 6 Mar 2017 12:36:44 +0000 (13:36 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 6 Mar 2017 12:36:44 +0000 (13:36 +0100)
Change-Id: I2a895a56625f088f4f90de41a9a8e00dad0dc530

14 files changed:
1  2 
tests/tine20/Felamimail/Frontend/JsonTest.php
tine20/Addressbook/Frontend/Cli.php
tine20/Addressbook/Model/Contact.php
tine20/Addressbook/Model/ContactFilter.php
tine20/Calendar/Controller/MSEventFacade.php
tine20/Felamimail/Controller/Account.php
tine20/Felamimail/Controller/Message/Send.php
tine20/Felamimail/Setup/Update/Release10.php
tine20/Felamimail/Setup/Update/Release9.php
tine20/Felamimail/Setup/setup.xml
tine20/Felamimail/js/Model.js
tine20/Tinebase/Controller/ScheduledImport.php
tine20/Tinebase/js/ux/form/ImageField.js
tine20/Tinebase/js/widgets/persistentfilter/PickerPanel.js

Simple merge
Simple merge
index dacfd9c,0000000..b830324
mode 100644,000000..100644
--- /dev/null
@@@ -1,24 -1,0 +1,36 @@@
 +<?php
 +/**
 + * Tine 2.0
 + *
 + * @package     Felamimail
 + * @subpackage  Setup
 + * @license     http://www.gnu.org/licenses/agpl.html AGPL3
 + * @copyright   Copyright (c) 2015-2016 Metaways Infosystems GmbH (http://www.metaways.de)
 + * @author      Philipp Schüle <p.schuele@metaways.de>
 + */
 +class Felamimail_Setup_Update_Release10 extends Setup_Update_Abstract
 +{
 +    /**
 +     * update to 10.1
 +     * 
 +     * change signature to medium text
 +     */
 +    public function update_0()
 +    {
 +        $update9 = new Felamimail_Setup_Update_Release9($this->_backend);
 +        $update9->update_2();
 +        $this->setApplicationVersion('Felamimail', '10.1');
 +    }
++
++    /**
++     * update to 10.2
++     *
++     * @see 0002284: add reply-to setting to email account
++     */
++    public function update_1()
++    {
++        $update9 = new Felamimail_Setup_Update_Release9($this->_backend);
++        $update9->update_3();
++        $this->setApplicationVersion('Felamimail', '10.2');
++    }
 +}
@@@ -57,27 -57,38 +57,48 @@@ class Felamimail_Setup_Update_Release9 
       */
      public function update_2()
      {
 -        $declaration = new Setup_Backend_Schema_Field_Xml('
 -                <field>
 -                    <name>signature</name>
 -                    <type>text</type>
 -                    <length>16777215</length>
 -                </field>');
 -        
 -        $this->_backend->alterCol('felamimail_account', $declaration);
 -        
 +        if ($this->getTableVersion('felamimail_account') < 22) {
 +            $declaration = new Setup_Backend_Schema_Field_Xml('
 +                    <field>
 +                        <name>signature</name>
 +                        <type>text</type>
 +                        <length>16777215</length>
 +                    </field>');
 +            $this->_backend->alterCol('felamimail_account', $declaration);
 +            $this->setTableVersion('felamimail_account', '22');
 +        }
 +
          $this->setApplicationVersion('Felamimail', '9.3');
 -        $this->setTableVersion('felamimail_account', '22');
      }
  
 -
      /**
-     public function update_3()
+      * update to 9.4
+      *
+      * @see 0002284: add reply-to setting to email account
+      */
+     public function update_3()
+     {
+         if ($this->getTableVersion('felamimail_account') < 23) {
+             $declaration = new Setup_Backend_Schema_Field_Xml('
+             <field>
+                     <name>reply_to</name>
+                     <type>text</type>
+                     <length>255</length>
+             </field>');
+             $this->_backend->addCol('felamimail_account', $declaration, 19);
+             $this->setTableVersion('felamimail_account', 23);
+         }
+         $this->setApplicationVersion('Felamimail', '9.4');
+     }
++
++    /**
 +     * update to 10.0
 +     *
 +     * @return void
 +     */
++    public function update_4()
 +    {
 +        $this->setApplicationVersion('Felamimail', '10.0');
 +    }
  }
@@@ -1,7 -1,7 +1,7 @@@
  <?xml version="1.0" encoding="utf-8"?>
  <application>
      <name>Felamimail</name>
-     <version>10.1</version>
 -    <version>9.4</version>
++    <version>10.2</version>
      <order>30</order>
      <status>enabled</status>
      <tables>
Simple merge