Merge branch 'master' into fix/exclude_tests_from_swiftlint_rules

SETUP.md

@@ -79,3 +79,28 @@ Please submit translations via [Transifex][transifex].
 [1]: https://owncloud.org/about/contributor-agreement/
 [2]: http://opensource.org/licenses/MIT
 [3]: https://owncloud.org/contribute/iOS-license-exception/
+
+## Local ownCloud server for testing
+
+You can easily fire up an ownCloud server on your Mac using Docker.
+
+1. [Install Docker](https://docs.docker.com/docker-for-mac/)
+2. Run this in Terminal.app to start ownCloud with Docker
+```
+docker run --rm -d \
+  --name owncloud \
+  -p 18080:8080 \
+  -e OWNCLOUD_APPS_INSTALL=oauth2 \
+  -e ADMIN_USERNAME=admin \
+  -e ADMIN_PASSWORD=admin \
+  owncloud/server:latest
+```
+3. Access from local Mac browser or Simulator:  
+ http://localhost:18080/  
+ user: admin  
+ password: admin
+4. To test the  app on a iOS device in your local network, you can use the IP of your machine as the Server URL
+5. To remove the ownCloud Docker, just run `docker kill owncloud`
+
+Here you can find more information about running ownCloud with Docker:
+https://github.com/owncloud-docker/server

ownCloud File Provider/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
-	<string>85</string>
+	<string>86</string>
 	<key>OCAppGroupIdentifier</key>
 	<string>group.com.owncloud.ios-app</string>
 	<key>OCAppIdentifierPrefix</key>

ownCloud File ProviderUI/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
-	<string>85</string>
+	<string>86</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionFileProviderActions</key>

ownCloud.xcodeproj/project.pbxproj

@@ -1962,7 +1962,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 85;
+				CURRENT_PROJECT_VERSION = 86;
 				DEVELOPMENT_TEAM = 4AP2STM4H5;
 				FRAMEWORK_SEARCH_PATHS = "${TARGET_BUILD_DIR}";
 				GCC_WARN_UNUSED_LABEL = YES;
@@ -1989,7 +1989,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 85;
+				CURRENT_PROJECT_VERSION = 86;
 				DEVELOPMENT_TEAM = 4AP2STM4H5;
 				FRAMEWORK_SEARCH_PATHS = "${TARGET_BUILD_DIR}";
 				GCC_WARN_UNUSED_LABEL = YES;

ownCloud/Resources/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
-	<string>85</string>
+	<string>86</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ownCloudTests/Info.plist

@@ -17,6 +17,6 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
-	<string>85</string>
+	<string>86</string>
 </dict>
 </plist>