Merge branch 'develop' into deb-0.7.0-rc1

Conflicts:
	docs/man/bitmask-root.1.rst

11 files changed, 13 insertions, 0 deletions

diff --git a/changes/bug-5815_eip-preferences-issues b/changes/bug-5815_eip-preferences-issues
new file mode 100644
index 00000000..013fe03d
--- /dev/null
+++ b/changes/bug-5815_eip-preferences-issues
@@ -0,0 +1,2 @@
+- 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
new file mode 100644
index 00000000..d68c1122
--- /dev/null
+++ b/changes/bug-5866_bitmask-lock-not-removed
@@ -0,0 +1 @@
+- /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
new file mode 100644
index 00000000..94e41c25
--- /dev/null
+++ b/changes/bug-5945_not-adding-helper-files
@@ -0,0 +1 @@
+- Hide button and display correct warning on missing helpers files. Closes #5945.
diff --git a/changes/bug-6048_python2-bitmask-root b/changes/bug-6048_python2-bitmask-root
new file mode 100644
index 00000000..038196b0
--- /dev/null
+++ b/changes/bug-6048_python2-bitmask-root
@@ -0,0 +1 @@
+- Use python2 to run bitmask-root to work fine on systems with python3 as default. Closes #6048.
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
new file mode 100644
index 00000000..7ada612a
--- /dev/null
+++ b/changes/bug_5994_do-not-wait-for-eip-if-cannot-start
@@ -0,0 +1 @@
+- 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
new file mode 100644
index 00000000..35331a36
--- /dev/null
+++ b/changes/bug_python2-compat
@@ -0,0 +1 @@
+- 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
new file mode 100644
index 00000000..b10368ad
--- /dev/null
+++ b/changes/bug_use_token_for_eip
@@ -0,0 +1 @@
+- 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
new file mode 100644
index 00000000..3a381e68
--- /dev/null
+++ b/changes/code-and-logging-cleanup
@@ -0,0 +1 @@
+- Code cleanup and logging improvements.
diff --git a/changes/feature-6040-email-firewall b/changes/feature-6040-email-firewall
new file mode 100644
index 00000000..5ef70d28
--- /dev/null
+++ b/changes/feature-6040-email-firewall
@@ -0,0 +1 @@
+- 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
new file mode 100644
index 00000000..9326ca47
--- /dev/null
+++ b/changes/feature-6087_remove-AKM-menu
@@ -0,0 +1,2 @@
+- 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
new file mode 100644
index 00000000..146ac923
--- /dev/null
+++ b/changes/feature-combined-preferences-window
@@ -0,0 +1 @@
+- single combined preferences window (closes #4704, #4119, #5885)
\ No newline at end of file