From: tobiasKaminsky <tobias@kaminsky.me>
Date: Wed, 30 Sep 2015 16:40:13 +0000 (+0200)
Subject: Merge branch 'master' of github.com:owncloud/android into multiSelect
X-Git-Tag: beta-20151122~11^2~2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/36a635517b2e7c0985f33c1a532927803da4e79a?hp=f1670314c702223adef71490a787538320e934f7

Merge branch 'master' of github.com:owncloud/android into multiSelect
---

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 219ff2a3..099a4456 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,10 +6,15 @@
 - Preview the full file/folder name from the long press menu
 - Set a file as FAVORITE (kept-in-sync) from the CONTEXT MENU
 - Updated CONFLICT RESOLUTION dialog (wording)
-- Images with TRANSPARENT background are previewed correctly
-- Hidden files are not taken into account for enforcing or not the list VIEW
-- Several bugs fixed
-
+- Updated background for images with TRANSPARENCY in GALLERY
+- Hidden files will not enforce list view instead of GRID VIEW (folders from Picasa & others)
+- Security:
+  + Updated network stack with security fixes (Jackrabbit 2.10.1)
+- Bugs fixed:
+  + Fixed crash when ETag is lost
+  + Passcode creation not restarted on device rotation
+  + Recovered share icon shown on folders 'shared with me'
+  + User name added to subject when sending a share link through e-mail (fixed on SAMLed apps)
 
 ## 1.7.2 (July 2015)
 - New navigation drawer