BFN

Conflicts: kronolith/docs/CHANGES kronolith/package.xml nag/docs/CHANGES nag/package.xml
horde · Aug 29, 2014 · 8a26af0 · 8a26af0
1 parent dab53b6
commit 8a26af0
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 2 deletions.
diff --git a/kronolith/package.xml b/kronolith/package.xml
@@ -2432,6 +2432,22 @@
 * [mjr] Fix catching minical clicks on browsers that return element names in uppercase (Jasper.Olbrich@students.uni-marburg.de, Bug #13370).
    </notes>
   </release>
+  <release>
+   <version>
+    <release>4.2.2</release>
+    <api>4.2.0</api></version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api></stability>
+   <date>2014-08-04</date>
+   <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
+   <notes>
+* [jan] Fix visual overlapping of certain events (Bug #13376).
+* [jan] Fix error editing events if using exotic date formats.
+* [jan] Fix JavaScript error if not showing all events in month view (Jasper Olbrich &lt;Jasper.Olbrich@students.uni-marburg.de&gt;, Bug #13433).
+* [jan] Fix displayed CalDAV URLs for shared calendars in basic view too (piper@hrz.uni-marburg.de, Bug #12380).
+   </notes>
+  </release>
   <release>
    <version>
     <release>4.3.0</release>

diff --git a/nag/docs/CHANGES b/nag/docs/CHANGES
@@ -4,9 +4,10 @@ v4.3.0-git
 
 [jan] Return ETags with browse() API method.
 
-----------
+
+------
 v4.2.1
-----------
+------
 
 [jan] Don't include external tasks with WebDAV task list.
 [jan] Fix displayed CalDAV URLs for shared task lists (Bug #12380).

diff --git a/nag/package.xml b/nag/package.xml
@@ -1577,6 +1577,19 @@
 * [mjr] Fix detecting task completion when sending task change notifications (Alfonso Marín Marín &lt;almarin@um.es&gt;, Bug #13350).
    </notes>
   </release>
+  <release>
+   <version>
+    <release>4.2.2</release>
+    <api>4.2.0</api></version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api></stability>
+   <date>2014-08-04</date>
+   <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
+   <notes>
+* [jan] Fix retrieving individual tasks via WebDAV.
+   </notes>
+  </release>
   <release>
    <version>
     <release>4.3.0</release>