Merge branch 'develop'

gee1k · Jul 21, 2019 · d9c70f0 · d9c70f0
2 parents c9cd540 + 4167b05
commit d9c70f0
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/uPic/AppDelegate.swift b/uPic/AppDelegate.swift
@@ -151,7 +151,7 @@ extension AppDelegate {
             var urls = [URL]()
 
             for path in filenames {
-                if fileExtensions.contains(path.pathExtension.lowercased()) {
+                if (fileExtensions.count == 0 || fileExtensions.contains(path.pathExtension.lowercased())) {
                     urls.append(URL(fileURLWithPath: path))
                 }
             }

diff --git a/uPic/Supporting Files/Info.plist b/uPic/Supporting Files/Info.plist
@@ -19,9 +19,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.7.4</string>
+	<string>0.7.5</string>
 	<key>CFBundleVersion</key>
-	<string>20190721</string>
+	<string>20190722</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/uPic/en.lproj/Localizable.strings b/uPic/en.lproj/Localizable.strings
@@ -137,7 +137,7 @@
 "host.placeholder.repo" = "Just the repo name, not the repo URL";
 "host.placeholder.domain" = "domain:https://xxx.com";
 "host.placeholder.domain-has-default" = "Can be empty, there is a default domain";
-"host.placeholder.resultPath" = "The path to the URL field in Response JSON, eg: data/ URL";
+"host.placeholder.resultPath" = "The path to the URL field in Response JSON";
 "host.placeholder.custom-domain" = "(optional),When filled, URL = domain + URL path value";
 
 

diff --git a/uPic/zh-Hans.lproj/Localizable.strings b/uPic/zh-Hans.lproj/Localizable.strings
@@ -134,7 +134,7 @@
 "host.placeholder.repo" = "只需要仓库名称，而不是仓库连接";
 "host.placeholder.domain" = "访问域名:https://xxx.com";
 "host.placeholder.domain-has-default" = "可为空，有默认域名";
-"host.placeholder.resultPath" = "返回 JSON 中的URL字段的路径，如：data/url";
+"host.placeholder.resultPath" = "返回 JSON 中的 URL 字段的路径";
 "host.placeholder.custom-domain" = "(可选)，当填写时，URL = 前缀 + URL 路径值";
 
 /*host type*/