Merge branch 'master' into turba_4_2

horde · Nov 20, 2013 · 593bf02 · 593bf02
2 parents 4cce2a5 + 8f8db0a
commit 593bf02
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/framework/ActiveSync/doc/Horde/ActiveSync/TODO b/framework/ActiveSync/doc/Horde/ActiveSync/TODO
@@ -30,3 +30,6 @@ BC BREAKING (i.e., Horde 6).
   backend. They need to be normalized in accepting/returning the same objects
   now that we support multiple folders per non-email collection.
 
+- Refactor Horde_ActiveSync_State_*::listDevices() to return a
+  Horde_ActiveSync_Device object instead of a hash keyed by backend field names
+  and to take the object property names as filters instead of backend field names.
diff --git a/framework/ActiveSync/package.xml b/framework/ActiveSync/package.xml
@@ -10,9 +10,9 @@
   <email>mrubinsk@horde.org</email>
   <active>yes</active>
  </lead>
- <date>2013-11-19</date>
+ <date>2013-11-20</date>
  <version>
-  <release>2.9.1</release>
+  <release>2.9.2</release>
   <api>2.9.0</api>
  </version>
  <stability>
@@ -21,9 +21,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
  <notes>
-* [mjr] Add ability to flag a specific device as blocked.
-* [mjr] Add ability to filter the list of devices on more than username.
-* [mjr] Attempt to recover old serialized data before forcing a repairing of Email collections.
+* 
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -1816,13 +1814,26 @@
    <stability>
     <release>stable</release>
     <api>stable</api></stability>
-   <date>2013-11-19</date>
+   <date>2013-11-20</date>
    <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
    <notes>
 * [mjr] Add ability to flag a specific device as blocked.
 * [mjr] Add ability to filter the list of devices on more than username.
 * [mjr] Attempt to recover old serialized data before forcing a repairing of Email collections.
    </notes>
   </release>
+  <release>
+   <version>
+    <release>2.9.2</release>
+    <api>2.9.0</api></version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api></stability>
+   <date>2013-11-20</date>
+   <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
+   <notes>
+* 
+   </notes>
+  </release>
  </changelog>
 </package>