--- a/docs/changelog.rst	Mon May 20 12:26:09 2013 +0200
+++ b/docs/changelog.rst	Fri Jun 07 00:31:11 2013 +0200
@@ -4,6 +4,45 @@
 Changelog
 =========
 
+1.7.0 (**2013-05-XX**)
+----------------------
+
+news
+++++
+
+- Manage User’s Groups(teams): create, delete, rename, add/remove users inside.
+  by delegated user group admins.
+- Implemented simple Gist functionality.
+- External authentication got special flag to controll user activation.
+- Created whitelist for API access. Each view can now be accessed by api_key
+  if added to whitelist.
+- Added dedicated file history page.
+- Added compare option into bookmarks
+- Improved diff display for binary files and renames.
+- Archive downloading are now stored in main action journal.
+- Switch gravatar to always use ssl.
+- Implements #842 RhodeCode version disclosure.
+- Allow underscore to be the optionally first character of username.
+
+fixes
++++++
+
+- #818: Bookmarks Do Not Display on Changeset View.
+- Fixed default permissions population during upgrades.
+- Fixed overwrite default user group permission flag.
+- Fixed issue with h.person() function returned prematurly giving only email
+  info from changeset metadata.
+- get_changeset uses now mercurial revrange to filter out branches.
+  Switch to branch it's around 20% faster this way.
+- Fixed some issues with paginators on chrome.
+- Forbid changing of repository type.
+- Adde missing permission checks in list of forks in repository settings.
+- Fixes #834 hooks error on remote pulling.
+- Fixes issues #849. Web Commits functionality failed for non-ascii files.
+- Fixed #850. Whoosh indexer should use the default revision when doing index.
+- Fixed #851 and #563 make-index crashes on non-ascii files.
+- Fixes #852, flash messages had issies with non-ascii messages
+
 1.6.0 (**2013-05-12**)
 ----------------------
 
@@ -20,7 +59,7 @@
   permissions when doing upgrades
 - Fixed some unicode problems with git file path
 - Fixed broken handling of adding an htsts headers.
-- Fixed redirection loop on changelog for empty repository 
+- Fixed redirection loop on changelog for empty repository
 - Fixed issue with web-editor that didn't preserve executable bit
   after editing files
 
@@ -29,7 +68,7 @@
 
 news
 ++++
- 
+
  - Redesign UI, with lots of small improvements.
  - Group management delegation. Group admin can manage a group, and repos
    under it, admin can create child groups inside group he manages.
@@ -57,7 +96,7 @@
  - Linaro's ldap sync scripts.
  - #797 git refs filter is now configurable via .ini file.
  - New ishell paster command for easier administrative tasks.
- 
+
 fixes
 +++++
 
@@ -68,8 +107,8 @@
  - #731 update-repoinfo sometimes failed to update data when changesets were
    initial commits.
  - #749,#805 and #516 Removed duplication of repo settings for rhodecode admins
-   and repo admins. 
- - Global permission update with "overwrite existing settings" shouldn't 
+   and repo admins.
+ - Global permission update with "overwrite existing settings" shouldn't
    override private repositories.
  - #642 added recursion limit for stats gathering.
  - #739 Delete/Edit repositories should only point to admin links if the user
@@ -99,7 +138,7 @@
  - Automatically assign instance_id for host and process if it has been set to *
  - Fixed multiple IP addresses in each of extracted IP.
  - Lot of other small bug fixes and improvements.
-  
+
 1.5.4 (**2013-03-13**)
 ----------------------