summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG14
-rw-r--r--client/changes/bug-4001_support-non-ascii-passwords1
-rw-r--r--client/changes/feature-use-chardet-as-fallback1
-rw-r--r--client/changes/feature_4097-allow-for-locking-creation-of-secrets-in-server2
-rw-r--r--client/src/leap/soledad/client/__init__.py2
-rw-r--r--common/changes/feature_4097-allow-for-locking-creation-of-secrets-in-server1
-rw-r--r--common/src/leap/soledad/common/errors.py4
-rw-r--r--server/changes/feature_4097-allow-for-locking-creation-of-secrets-in-server1
8 files changed, 17 insertions, 9 deletions
diff --git a/CHANGELOG b/CHANGELOG
index a7254c40..e82801a1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,17 @@
+0.4.2 Nov 1:
+Client:
+ o Support non-ascii passwords. Closes #4001.
+ o Change error severity for missing secrets path.
+ o Use chardet as fallback if cchardet not found.
+ o Improve bootstrap sequence and allow for locking the shared
+ database while creating/uploading the encryption secret. Closes
+ #4097.
+Common:
+ o Move some common functions and global variables to
+ leap.soledad.common.
+Server:
+ o Allow for locking the shared database. Closes #4097.
+
0.4.1 Oct 4:
Client:
o Save only UTF8 strings. Related to #3660.
diff --git a/client/changes/bug-4001_support-non-ascii-passwords b/client/changes/bug-4001_support-non-ascii-passwords
deleted file mode 100644
index 1288b4e3..00000000
--- a/client/changes/bug-4001_support-non-ascii-passwords
+++ /dev/null
@@ -1 +0,0 @@
- o Support non-ascii passwords. Closes #4001.
diff --git a/client/changes/feature-use-chardet-as-fallback b/client/changes/feature-use-chardet-as-fallback
deleted file mode 100644
index f96a959c..00000000
--- a/client/changes/feature-use-chardet-as-fallback
+++ /dev/null
@@ -1 +0,0 @@
- o Use chardet as fallback if cchardet not found.
diff --git a/client/changes/feature_4097-allow-for-locking-creation-of-secrets-in-server b/client/changes/feature_4097-allow-for-locking-creation-of-secrets-in-server
deleted file mode 100644
index e2a11c8f..00000000
--- a/client/changes/feature_4097-allow-for-locking-creation-of-secrets-in-server
+++ /dev/null
@@ -1,2 +0,0 @@
- o Improve bootstrap sequence and allow for locking the shared database while
- creating/uploading the encryption secret. Closes #4097.
diff --git a/client/src/leap/soledad/client/__init__.py b/client/src/leap/soledad/client/__init__.py
index f3820a51..534040ef 100644
--- a/client/src/leap/soledad/client/__init__.py
+++ b/client/src/leap/soledad/client/__init__.py
@@ -555,7 +555,7 @@ class Soledad(object):
try:
self._load_secrets() # try to load from disk
except IOError, e:
- logger.error('IOError: %s' % str(e))
+ logger.warning('IOError: %s' % str(e))
try:
self._get_storage_secret()
return True
diff --git a/common/changes/feature_4097-allow-for-locking-creation-of-secrets-in-server b/common/changes/feature_4097-allow-for-locking-creation-of-secrets-in-server
deleted file mode 100644
index 1d53e1ef..00000000
--- a/common/changes/feature_4097-allow-for-locking-creation-of-secrets-in-server
+++ /dev/null
@@ -1 +0,0 @@
- o Move some common functions and global variables to leap.soledad.common.
diff --git a/common/src/leap/soledad/common/errors.py b/common/src/leap/soledad/common/errors.py
index 45433627..7c2d7296 100644
--- a/common/src/leap/soledad/common/errors.py
+++ b/common/src/leap/soledad/common/errors.py
@@ -61,9 +61,9 @@ class AlreadyLockedError(errors.U1DBError):
# maps.
for e in [InvalidTokenError, NotLockedError, AlreadyLockedError]:
http_errors.wire_description_to_status.update({
- (e.wire_description, e.status)})
+ e.wire_description: e.status})
errors.wire_description_to_exc.update({
- (e.wire_description, e)})
+ e.wire_description: e})
# u1db error statuses also have to be updated
http_errors.ERROR_STATUSES = set(
diff --git a/server/changes/feature_4097-allow-for-locking-creation-of-secrets-in-server b/server/changes/feature_4097-allow-for-locking-creation-of-secrets-in-server
deleted file mode 100644
index 48b367d7..00000000
--- a/server/changes/feature_4097-allow-for-locking-creation-of-secrets-in-server
+++ /dev/null
@@ -1 +0,0 @@
- o Allow for locking the shared database. Closes #4097.