Merge branch 'master' into iWeek-LocalAuthentication

Alfresco · Jan 14, 2016 · bd3f7a4 · bd3f7a4
2 parents 22007bf + 1d76010
commit bd3f7a4
Show file tree

Hide file tree

Showing 14 changed files with 17 additions and 17 deletions.
diff --git a/AlfrescoApp.xcodeproj/project.pbxproj b/AlfrescoApp.xcodeproj/project.pbxproj
@@ -5155,7 +5155,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.4;
 				OTHER_CFLAGS = (
 					"$(inherited)",
 					"-DNS_BLOCK_ASSERTIONS=1",
@@ -5431,7 +5431,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.4;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -5463,7 +5463,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.4;
 				OTHER_CFLAGS = (
 					"$(inherited)",
 					"-DNS_BLOCK_ASSERTIONS=1",

diff --git a/AlfrescoApp/Model/Managers/LoginManager.m b/AlfrescoApp/Model/Managers/LoginManager.m
@@ -312,8 +312,8 @@ - (NSDictionary *)loadCustomCloudOAuthParameters
     self.cloudAPIKey = CLOUD_OAUTH_KEY;
     self.cloudSecretKey = CLOUD_OAUTH_SECRET;
 
-    // Checks for a cloud-config.plist file with custom connection parameters
-    NSString *plistPath = [[[AlfrescoFileManager sharedManager] documentsDirectory] stringByAppendingPathComponent:kCloudConfigFile];
+    // Checks for a cloud-config.plist file in the "Local Files" area with custom connection parameters
+    NSString *plistPath = [[[AlfrescoFileManager sharedManager] downloadsContentFolderPath] stringByAppendingPathComponent:kCloudConfigFile];
     NSDictionary *config = [NSDictionary dictionaryWithContentsOfFile:plistPath];
     NSString *customCloudURL = config[kCloudConfigParamURL];
 

diff --git a/AlfrescoApp/Supporting Files/Settings.bundle/Licenses.strings b/AlfrescoApp/Supporting Files/Settings.bundle/Licenses.strings
diff --git a/AlfrescoApp/Supporting Files/de.lproj/Activities.strings b/AlfrescoApp/Supporting Files/de.lproj/Activities.strings
@@ -4,7 +4,7 @@
  *
  * German (de)
  *
- * Copyright (c) 2014 Alfresco. All rights reserved.
+ * Copyright (c) 2015 Alfresco. All rights reserved.
  */
 
 /**

diff --git a/AlfrescoApp/Supporting Files/de.lproj/InfoPlist.strings b/AlfrescoApp/Supporting Files/de.lproj/InfoPlist.strings
@@ -4,7 +4,7 @@
  *
  * German (de)
  *
- * Copyright (c) 2014 Alfresco. All rights reserved.
+ * Copyright (c) 2015 Alfresco. All rights reserved.
  */
 
 /* Localized versions of Info.plist keys */

diff --git a/AlfrescoApp/Supporting Files/es.lproj/InfoPlist.strings b/AlfrescoApp/Supporting Files/es.lproj/InfoPlist.strings
@@ -4,7 +4,7 @@
  *
  * Spanish (es)
  *
- * Copyright (c) 2014 Alfresco. All rights reserved.
+ * Copyright (c) 2015 Alfresco. All rights reserved.
  */
 
 /* Localized versions of Info.plist keys */

diff --git a/AlfrescoApp/Supporting Files/fr.lproj/Activities.strings b/AlfrescoApp/Supporting Files/fr.lproj/Activities.strings
@@ -4,7 +4,7 @@
  *
  * French (fr)
  *
- * Copyright (c) 2014 Alfresco. All rights reserved.
+ * Copyright (c) 2015 Alfresco. All rights reserved.
  */
 
 /**

diff --git a/AlfrescoApp/Supporting Files/fr.lproj/InfoPlist.strings b/AlfrescoApp/Supporting Files/fr.lproj/InfoPlist.strings
@@ -4,7 +4,7 @@
  *
  * French (fr)
  *
- * Copyright (c) 2014 Alfresco. All rights reserved.
+ * Copyright (c) 2015 Alfresco. All rights reserved.
  */
 
 /* Localized versions of Info.plist keys */

diff --git a/AlfrescoApp/Supporting Files/it.lproj/InfoPlist.strings b/AlfrescoApp/Supporting Files/it.lproj/InfoPlist.strings
@@ -4,7 +4,7 @@
  *
  * Italian (it)
  *
- * Copyright (c) 2014 Alfresco. All rights reserved.
+ * Copyright (c) 2015 Alfresco. All rights reserved.
  */
 
 /* Localized versions of Info.plist keys */

diff --git a/AlfrescoApp/Supporting Files/ja.lproj/Activities.strings b/AlfrescoApp/Supporting Files/ja.lproj/Activities.strings
@@ -4,7 +4,7 @@
  *
  * Japanese (ja)
  *
- * Copyright (c) 2014 Alfresco. All rights reserved.
+ * Copyright (c) 2015 Alfresco. All rights reserved.
  */
 
 /**

diff --git a/AlfrescoApp/Supporting Files/ja.lproj/InfoPlist.strings b/AlfrescoApp/Supporting Files/ja.lproj/InfoPlist.strings
@@ -4,9 +4,9 @@
  *
  * Japanese (ja)
  *
- * Copyright (c) 2014 Alfresco. All rights reserved.
+ * Copyright (c) 2015 Alfresco. All rights reserved.
  */
 
 /* Localized versions of Info.plist keys */
-NSLocationUsageDescription = "現在の位置は、このデバイスで撮影した写真の位置情報（ジオタグ）に使用されます。";
+NSLocationUsageDescription = "現在地がこのデバイスで撮影した写真の位置情報 （ジオタグ） に使用されます。";
 NSMicrophoneUsageDescription = "マイクを使用して音声を録音します。音声は後でリポジトリにアップロードできます。";
diff --git a/AlfrescoApp/Supporting Files/zh-Hans.lproj/Activities.strings b/AlfrescoApp/Supporting Files/zh-Hans.lproj/Activities.strings
@@ -4,7 +4,7 @@
  *
  * Chinese (Simplified) (zh-cn)
  *
- * Copyright (c) 2014 Alfresco. All rights reserved.
+ * Copyright (c) 2015 Alfresco. All rights reserved.
  */
 
 /**

diff --git a/AlfrescoApp/Supporting Files/zh-Hans.lproj/InfoPlist.strings b/AlfrescoApp/Supporting Files/zh-Hans.lproj/InfoPlist.strings
@@ -4,7 +4,7 @@
  *
  * Chinese (Simplified) (zh-cn)
  *
- * Copyright (c) 2014 Alfresco. All rights reserved.
+ * Copyright (c) 2015 Alfresco. All rights reserved.
  */
 
 /* Localized versions of Info.plist keys */

diff --git a/AlfrescoSDK b/AlfrescoSDK