Merge branch 'master' of https://github.com/nextcloud/android into re…

…sizedImages

# Conflicts:
#	scripts/lint/lint-results.txt
#	src/main/res/values/strings.xml

CHANGELOG.md

@@ -1,5 +1,28 @@
+## 2.0.0 (2017)
+
+- Account-wide search (Nc 12+)
+- Auto upload available on Android 4+
+- Separation between Image & Video for Auto upload
+- Ability to define custom folders for Auto upload
+- Simple contacts backup & restore
+- Server-side Theming support
+- Shared files view
+- Notifications view and Push notifications (on Google Play-powered devices)
+- Favorites, Photos and Activities
+- Fingerprint locking
+- SVG preview
+- Set edit permissions in federated shares of folders (Nc 10+)
+- New sorting dialog
+- User information view
+- Custom external links support
+- Detect server maintainance mode
+- Nicer error views for images & video preview
+- Included privacy policy
+- Preserve modification time of uploaded files
+- Various bug fixes & improvements
+
 ## 1.4.3 (May 22, 2017)
-- Hotfix: ignore oauth header for now and use basic auth to allow new logins for nc12
+- Hotfix: ignore oauth header for now and use basic auth to allow new logins for Nc12
 
 ## 1.4.2 (March 14, 2017)
 - Auto Upload for newly taken photos/images (Android 6+)
@@ -9,7 +32,7 @@
 - Fix re-upload of files
 - Avoid toggling favourite for all selected files
 - Link to providers list in the setup screen
-- further bugfixes and improvements
+- Further bug fixes and improvements
 
 ## 1.4.1 (January 27, 2017)
 - Share URLs to Nextcloud
@@ -19,7 +42,7 @@
 - Navigation drawer: Fix lag on older devices
 - Android 7: Pending jobs in upload view
 - Android 7: Auto upload: ignore ".tmp" files and folders
-- Bugfixes and design improvements
+- Bug fixes and design improvements
 
 ## 1.4.0 (December 8, 2016)
 
@@ -89,4 +112,4 @@
 
 ## 1.0.0 (June 12, 2016)
 
-- Initial release of the Nextcloud Android app 
+- Initial release of the Nextcloud Android app

README.md

@@ -1,4 +1,4 @@
-# [Nextcloud](https://nextcloud.com) Android app [![Build Status](https://drone.nextcloud.com/api/badges/nextcloud/android/status.svg)](https://drone.nextcloud.com/nextcloud/android) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/80401cb343854343b4d94acbfb72d3ec)](https://www.codacy.com/app/Nextcloud/android?utm_source=github.com&utm_medium=referral&utm_content=nextcloud/android&utm_campaign=Badge_Grade)
+# [Nextcloud](https://nextcloud.com) Android app [![Build Status](https://drone.nextcloud.com/api/badges/nextcloud/android/status.svg)](https://drone.nextcloud.com/nextcloud/android) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/80401cb343854343b4d94acbfb72d3ec)](https://www.codacy.com/app/Nextcloud/android?utm_source=github.com&utm_medium=referral&utm_content=nextcloud/android&utm_campaign=Badge_Grade) [![Releases](https://img.shields.io/github/release/nextcloud/android.svg)](https://github.com/nextcloud/android/releases/latest)
 
 [<img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png" 
       alt="Download from Google Play" 

build.gradle

@@ -184,7 +184,7 @@ dependencies {
     /// dependencies for app building
     implementation name: 'touch-image-view'
     implementation 'com.android.support:multidex:1.0.2'
-    implementation 'com.github.nextcloud:android-library:1.0.24'
+    implementation 'com.github.nextcloud:android-library:1.0.25'
     implementation "com.android.support:support-v4:${supportLibraryVersion}"
     implementation "com.android.support:design:${supportLibraryVersion}"
     implementation 'com.jakewharton:disklrucache:2.0.2'
@@ -203,6 +203,7 @@ dependencies {
     // uncomment for gplay, modified
     // implementation "com.google.firebase:firebase-messaging:${googleLibraryVersion}"
     // implementation "com.google.android.gms:play-services-base:${googleLibraryVersion}"
+    // implementation "com.google.android.gms:play-services-gcm:${googleLibraryVersion}"
     // implementation "com.google.firebase:firebase-core:${googleLibraryVersion}"
     implementation 'org.parceler:parceler-api:1.1.6'
     annotationProcessor 'org.parceler:parceler:1.1.6'