Merge branch '2013.03' into 2013.10
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 11 Nov 2013 15:58:31 +0000 (16:58 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 11 Nov 2013 15:58:31 +0000 (16:58 +0100)
Conflicts:
tine20/Calendar/Controller/EventNotifications.php

1  2 
tests/tine20/Calendar/Controller/EventTests.php
tests/tine20/Felamimail/JsonTest.php
tine20/Calendar/Controller/EventNotifications.php
tine20/Calendar/Model/Event.php
tine20/Felamimail/Controller/Message/Send.php

Simple merge
@@@ -72,9 -70,9 +72,9 @@@
          $diff = $_event->diff($_oldEvent)->diff;
          
          $orderedUpdateFieldOfInterest = array(
-             'dtstart', 'dtend', 'summary', 'location', 'description',
+             'dtstart', 'dtend', 'rrule', 'summary', 'location', 'description',
              'transp', 'priority', 'status', 'class',
 -            'url', 'rrule', 'is_all_day_event', 'originator_tz', /*'tags', 'notes',*/
 +            'url', 'is_all_day_event', 'originator_tz', /*'tags', 'notes',*/
          );
          
          $updates = array();
Simple merge