updated changelog

ergo · Apr 27, 2016 · 5b8427f · 5b8427f
1 parent 3f46ff3
commit 5b8427f
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 6 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,12 +1,14 @@
 Changelog
 =========
 2016-04-27
+----------
 * Release: 0.6.4
 * got rid of all unicode warnings generated by sqlalchemy and start to use
   unicode for all strings
 * user.resources_with_possible_perms() passes resource_types properly
 
 2016-04-19
+----------
 * Release: 0.6.3
 * extended functionality of `populate_obj` function of Base class
 * minor bugfix for mysql
@@ -16,15 +18,18 @@ Changelog
 
 
 2015-11-13
+----------
 * Release: 0.6.2
 * replace cryptacular with passlib
 
 
 2015-09-19
+----------
 * Release: 0.6.1
 * some fixes for ext.pyramid not-working completly with service related changes
 
 2015-08-03
+----------
 * Release: 0.6.0
 * models are decoupled from services that interact with models
   (all model querying methods now live in services)
@@ -36,6 +41,7 @@ Changelog
 
 
 2015-06-15
+----------
 * Release: 0.5.6
 * user model gains security date column
 * minor bugfixes

diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -9,15 +9,44 @@ Changelog
     Alembic 0.3.3+ (or current trunk for 2012-05-27) is required for this to function properly
 
 
-2015-07-X
+2016-04-27
+----------
+* Release: 0.6.4
+* got rid of all unicode warnings generated by sqlalchemy and start to use
+  unicode for all strings
+* user.resources_with_possible_perms() passes resource_types properly
+
+2016-04-19
+----------
+* Release: 0.6.3
+* extended functionality of `populate_obj` function of Base class
+* minor bugfix for mysql
+* BACKWARDS INCOMPATIBLE CHANGES
+  * external_identities.local_user_name column is dropped and replaced with
+    local_user_id
+
+
+2015-11-13
+----------
+* Release: 0.6.2
+* replace cryptacular with passlib
+
+
+2015-09-19
+----------
+* Release: 0.6.1
+* some fixes for ext.pyramid not-working completly with service related changes
+
+2015-08-03
 ----------
 * Release: 0.6.0
 * models are decoupled from services that interact with models
   (all model querying methods now live in services)
-* **BACKWARDS INCOMPATIBLE CHANGES**
-    * import related changes:
-        * ziggurat_foundations.models doesn't import all the models anymore every model now lives in separate file
-        * permission related functions now live in permissions module
+* BACKWARDS INCOMPATIBLE CHANGES
+  * import related changes:
+      * ziggurat_foundations.models doesn't import all the models anymore
+        every model now lives in separate file
+      * permission related functions now live in permissions module
 
 
 2015-06-15
@@ -139,4 +168,4 @@ Changelog
 
 2011-08-14
 ----------
-* resource.users_for_perm(),  resource.direct_perms_for_user() and resource.group_perms_for_user() return tuple (user/group_name,perm_name) now
+* resource.users_for_perm(),  resource.direct_perms_for_user() and resource.group_perms_for_user() return tuple (user/group_name,perm_name) now