Fold in changes

16 files changed, 28 insertions, 17 deletions

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index c47e531a..3c863657 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -6,6 +6,34 @@ History
 2014
 ====
 
+0.7.0 September 26 -- the "one time download, all time updates" release:
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+- Select current provider on EIP preferences. Closes #5815.
+- Handle logout correctly when we stop_services to launch the
+  wizard. Related to #5815.
+- Properly remove /tmp/bitmask.lock. Closes #5866.
+- Hide EIP Start button and display correct warning on missing helpers
+  files. Closes #5945.
+- Save default provider if changed on the combo box. Closes #5995.
+- Update the EIP status on provider change. Closes #5996.
+- Update and get ready to start a provider on change. Closes #5997.
+- Use python2 to run bitmask-root to work fine on systems with python3
+  as default. Closes #6048.
+- Use python2.7 in bitmask-root shebang since is the common name for
+  python 2 in Ubuntu, Debian, Arch. Related to #6048.
+- Remove dict comprenension in util, for 2.6 compat.
+- Login shall not wait for eip to finish if eip is not able to
+  start. Closes #5994
+- Properly send the token for querying the EIP certificate. Fixes
+  #6060.
+- Code cleanup and logging improvements.
+- Add email firewall blocking other users to access bitmask imap &
+  smtp. Closes #6040
+- Remove the Advanced Key Management since we don't support stable
+  mail yet. Closes #6087.
+- Single combined preferences window. Closes #4704, #4119, #5885.
+
 0.6.1 August 15 -- the "knock knock knocking on beta's door" release:
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
diff --git a/changes/bug-5815_eip-preferences-issues b/changes/bug-5815_eip-preferences-issues
deleted file mode 100644
index 013fe03d..00000000
--- a/changes/bug-5815_eip-preferences-issues
+++ /dev/null
@@ -1,2 +0,0 @@
-- Select current provider on EIP preferences. Closes #5815.
-- Handle logout correctly when we stop_services to launch the wizard. Related to #5815.
diff --git a/changes/bug-5866_bitmask-lock-not-removed b/changes/bug-5866_bitmask-lock-not-removed
deleted file mode 100644
index d68c1122..00000000
--- a/changes/bug-5866_bitmask-lock-not-removed
+++ /dev/null
@@ -1 +0,0 @@
-- /tmp/bitmask.lock not removed. Closes #5866.
diff --git a/changes/bug-5945_not-adding-helper-files b/changes/bug-5945_not-adding-helper-files
deleted file mode 100644
index 94e41c25..00000000
--- a/changes/bug-5945_not-adding-helper-files
+++ /dev/null
@@ -1 +0,0 @@
-- Hide button and display correct warning on missing helpers files. Closes #5945.
diff --git a/changes/bug-5995_save-provider-on-change b/changes/bug-5995_save-provider-on-change
deleted file mode 100644
index e0f86d75..00000000
--- a/changes/bug-5995_save-provider-on-change
+++ /dev/null
@@ -1 +0,0 @@
-- Save default provider if changed on the combo box. Closes #5995.
diff --git a/changes/bug-5996_update-eip-status-on-change b/changes/bug-5996_update-eip-status-on-change
deleted file mode 100644
index 665092f0..00000000
--- a/changes/bug-5996_update-eip-status-on-change
+++ /dev/null
@@ -1 +0,0 @@
-- Update the EIP status on provider change. Closes #5996.
diff --git a/changes/bug-5997_get-ready-provider-on-change b/changes/bug-5997_get-ready-provider-on-change
deleted file mode 100644
index e6b3f7f1..00000000
--- a/changes/bug-5997_get-ready-provider-on-change
+++ /dev/null
@@ -1 +0,0 @@
-- Update and get ready to start a provider on change. Closes #5997.
diff --git a/changes/bug-6048_python2-bitmask-root b/changes/bug-6048_python2-bitmask-root
deleted file mode 100644
index 038196b0..00000000
--- a/changes/bug-6048_python2-bitmask-root
+++ /dev/null
@@ -1 +0,0 @@
-- Use python2 to run bitmask-root to work fine on systems with python3 as default. Closes #6048.
diff --git a/changes/bug-remove-dict-comprenhension b/changes/bug-remove-dict-comprenhension
deleted file mode 100644
index 4e9468d8..00000000
--- a/changes/bug-remove-dict-comprenhension
+++ /dev/null
@@ -1 +0,0 @@
-- Remove dict comprenension in util, for 2.6 compat.
diff --git a/changes/bug_5994_do-not-wait-for-eip-if-cannot-start b/changes/bug_5994_do-not-wait-for-eip-if-cannot-start
deleted file mode 100644
index 7ada612a..00000000
--- a/changes/bug_5994_do-not-wait-for-eip-if-cannot-start
+++ /dev/null
@@ -1 +0,0 @@
-- Login shall not wait for eip to finish if eip is not able to start. Closes: #5994
diff --git a/changes/bug_python2-compat b/changes/bug_python2-compat
deleted file mode 100644
index 35331a36..00000000
--- a/changes/bug_python2-compat
+++ /dev/null
@@ -1 +0,0 @@
-- Use python2.7 since is the common name for python 2 in Ubuntu, Debian, Arch. Related to #6048.
diff --git a/changes/bug_use_token_for_eip b/changes/bug_use_token_for_eip
deleted file mode 100644
index b10368ad..00000000
--- a/changes/bug_use_token_for_eip
+++ /dev/null
@@ -1 +0,0 @@
-- Properly send the token for querying the EIP certificate. Fixes #6060.
\ No newline at end of file
diff --git a/changes/code-and-logging-cleanup b/changes/code-and-logging-cleanup
deleted file mode 100644
index 3a381e68..00000000
--- a/changes/code-and-logging-cleanup
+++ /dev/null
@@ -1 +0,0 @@
-- Code cleanup and logging improvements.
diff --git a/changes/feature-6040-email-firewall b/changes/feature-6040-email-firewall
deleted file mode 100644
index 5ef70d28..00000000
--- a/changes/feature-6040-email-firewall
+++ /dev/null
@@ -1 +0,0 @@
-- Add email firewall blocking other users to access bitmask imap & smtp. Closes #6040
diff --git a/changes/feature-6087_remove-AKM-menu b/changes/feature-6087_remove-AKM-menu
deleted file mode 100644
index 9326ca47..00000000
--- a/changes/feature-6087_remove-AKM-menu
+++ /dev/null
@@ -1,2 +0,0 @@
-- Remove the Advanced Key Management since we don't support stable mail yet.
-  Closes #6087.
diff --git a/changes/feature-combined-preferences-window b/changes/feature-combined-preferences-window
deleted file mode 100644
index 146ac923..00000000
--- a/changes/feature-combined-preferences-window
+++ /dev/null
@@ -1 +0,0 @@
-- single combined preferences window (closes #4704, #4119, #5885)
\ No newline at end of file