Merge branch 'pu/2013.10-icsimport'
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 29 Aug 2014 17:20:10 +0000 (19:20 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 29 Aug 2014 17:20:10 +0000 (19:20 +0200)
Conflicts:
tests/tine20/Calendar/Import/ICalTest.php
tine20/Calendar/Setup/Update/Release8.php

Change-Id: I25865876ee469a59ebb8f4d7bec3386b710cb380

1  2 
tests/tine20/Calendar/Import/ICalTest.php
tests/tine20/Calendar/TestCase.php
tine20/Calendar/Setup/Update/Release8.php
tine20/Calendar/Setup/setup.xml
tine20/Calendar/js/MainScreenCenterPanel.js
tine20/Tinebase/Tinebase.jsb2

Simple merge
@@@ -171,24 -170,7 +171,33 @@@ class Calendar_Setup_Update_Release8 ex
       */
      public function update_3()
      {
 -        Setup_Controller::getInstance()->createImportExportDefinitions(Tinebase_Application::getInstance()->getApplicationByName('Calendar'));
 +        $declaration = new Setup_Backend_Schema_Field_Xml('
 +            <field>
 +                <name>etag</name>
 +                <type>text</type>
 +                <length>60</length>
 +            </field>');
 +        $this->_backend->addCol('cal_events', $declaration);
 +        
 +        $declaration = new Setup_Backend_Schema_Index_Xml('
 +            <index>
 +                <name>etag</name>
 +                <field>
 +                    <name>etag</name>
 +                </field>
 +            </index>');
 +        $this->_backend->addIndex('cal_events', $declaration);
 +        
 +        $this->setTableVersion('cal_events', 7);
          $this->setApplicationVersion('Calendar', '8.4');
      }
++    
++    /**
++     * - update import / export
++     */
++    public function update_4()
++    {
++        Setup_Controller::getInstance()->createImportExportDefinitions(Tinebase_Application::getInstance()->getApplicationByName('Calendar'));
++        $this->setApplicationVersion('Calendar', '8.5');
++    }
  }
@@@ -2,7 -2,7 +2,7 @@@
  <application>
      <name>Calendar</name>
      <!-- gettext('Calendar') -->   
--    <version>8.4</version>
++    <version>8.5</version>
      <order>15</order>
      <status>enabled</status>
      <tables>
Simple merge