Merge pull request #1 from mstarke/master

update from origin 20170708
2025-12-14 04:42:29 +00:00 · 2017-07-08 01:18:00 +08:00
parent 1c69c57924 47c9491e71
commit 1d6b78bfe6
722 changed files with 42638 additions and 8349 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,8 @@ build/*
 xcuserdata
 profile
 *.moved-aside
-
+Assets/MacPass Icons Grayscale V3.ai
+Assets/MacPass Icons Grayscale V4.ai
+MacPass.xcodeproj/xcshareddata/xcbaselines
+Carthage
+.DS_store
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,21 +1,6 @@
-[submodule "KissXML"]
-	path = KissXML
-	url = https://github.com/robbiehanson/KissXML.git
-[submodule "HNHUi"]
-	path = HNHUi
-	url = https://mstarke@github.com/mstarke/HNHUi.git
-[submodule "CocoaHTTPServer"]
-	path = CocoaHTTPServer
-	url = git://github.com/robbiehanson/CocoaHTTPServer.git
-[submodule "KeePassKit"]
-	path = KeePassKit
-	url = https://mstarke@github.com/mstarke/KeePassKit
 [submodule "DDHotKey"]
 	path = DDHotKey
-	url = https://github.com/davedelong/DDHotKey.git
-[submodule "Sparkle"]
-	path = Sparkle
-	url = https://github.com/mstarke/Sparkle.git
+	url = https://github.com/mstarke/DDHotKey.git
 [submodule "TransformerKit"]
 	path = TransformerKit
 	url = https://github.com/mattt/TransformerKit.git
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,31 @@
+osx_image: xcode8.3
+xcode_project: MacPass.xcodeproj
+xcode_scheme: MacPass
+language: objective-c
+
+before_install:
+  - carthage bootstrap --platform Mac
+
+after_success:
+  - cd ./build/Build/Products/Release
+  - zip -9r MacPass-continuous.zip MacPass.app
+  - cd -
+  - mv ./build/Build/Products/Release/MacPass-continuous.zip .
+
+script: xcodebuild clean && xcodebuild build -configuration release -project MacPass.xcodeproj  -scheme MacPass CODE_SIGNING_REQUIRED=NO -derivedDataPath ./build
+
+branches:
+  only:
+    - /^(?i:continuous)$/
+
+deploy:
+  skip_cleanup: true
+  provider: releases
+  api_key:
+    secure: AEb7fgi29S3aXFt5bXz+lq1KHISumny6bf4j06JBC5gUrSs+dW0/tmVFq68XRAqigeOQU31wwv20f7OHiy+GRYDXM2xBsX9ZBQ2IilnaXlDy/mPsNcJJJsZ2gyodi3KnU0rZtTb93me2YyU86H4Na/gtaZZUKjLwCFtGGziExD8=
+  file: MacPass-continuous.zip
+  overwrite: true
+  on:
+    tags: true
+    repo: mstarke/MacPass
+    branch: continuous
--- a/AppIcon.afdesign
+++ b/AppIcon.afdesign
--- a/icon/MacPass.iconset/icon_128x128.png
+++ b/icon/MacPass.iconset/icon_128x128.png
--- a/icon/MacPass.iconset/icon_128x128@2x.png
+++ b/icon/MacPass.iconset/icon_128x128@2x.png
--- a/icon/MacPass.iconset/icon_256x256.png
+++ b/icon/MacPass.iconset/icon_256x256.png
--- a/icon/MacPass.iconset/icon_256x256@2x.png
+++ b/icon/MacPass.iconset/icon_256x256@2x.png
--- a/icon/MacPass.iconset/icon_32x32@2x.png
+++ b/icon/MacPass.iconset/icon_32x32@2x.png
--- a/icon/MacPass.iconset/icon_512x512.png
+++ b/icon/MacPass.iconset/icon_512x512.png
--- a/icon/MacPass.iconset/icon_512x512@2x.png
+++ b/icon/MacPass.iconset/icon_512x512@2x.png
--- a/Icons.sketch/Data
+++ b/Icons.sketch/Data
--- a/Icons.sketch/QuickLook/Preview.png
+++ b/Icons.sketch/QuickLook/Preview.png
--- a/Icons.sketch/QuickLook/Thumbnail.png
+++ b/Icons.sketch/QuickLook/Thumbnail.png
--- a/Icons.sketch/fonts
+++ b/Icons.sketch/fonts
--- a/Icons.sketch/version
+++ b/Icons.sketch/version
@@ -1 +0,0 @@
-8
--- a/files/00_PasswordTemplate.pdf
+++ b/files/00_PasswordTemplate.pdf
--- a/files/01_PackageNetworkTemplate.pdf
+++ b/files/01_PackageNetworkTemplate.pdf
--- a/files/02_MessageBoxWarningTemplate.pdf
+++ b/files/02_MessageBoxWarningTemplate.pdf
--- a/files/03_ServerTemplate.pdf
+++ b/files/03_ServerTemplate.pdf
--- a/files/04_KlipperTemplate.pdf
+++ b/files/04_KlipperTemplate.pdf
--- a/files/05_LanguagesTemplate.pdf
+++ b/files/05_LanguagesTemplate.pdf
--- a/files/06_BlockDeviceTemplate.pdf
+++ b/files/06_BlockDeviceTemplate.pdf
--- a/files/07_NotepadTemplate.pdf
+++ b/files/07_NotepadTemplate.pdf
--- a/files/08_SocketTemplate.pdf
+++ b/files/08_SocketTemplate.pdf
--- a/files/09_IdentityTemplate.pdf
+++ b/files/09_IdentityTemplate.pdf
--- a/files/100.pdf
+++ b/files/100.pdf
--- a/files/10_ContactTemplate.pdf
+++ b/files/10_ContactTemplate.pdf
--- a/files/11_CameraTemplate.pdf
+++ b/files/11_CameraTemplate.pdf
--- a/files/12_RemoteTemplate.pdf
+++ b/files/12_RemoteTemplate.pdf
--- a/files/13_KeysTemplate.pdf
+++ b/files/13_KeysTemplate.pdf
--- a/files/14_BatteryTemplate.pdf
+++ b/files/14_BatteryTemplate.pdf
--- a/files/15_ScannerTemplate.pdf
+++ b/files/15_ScannerTemplate.pdf
--- a/files/16_BrowserTemplate.pdf
+++ b/files/16_BrowserTemplate.pdf
--- a/files/17_CDRomTemplate.pdf
+++ b/files/17_CDRomTemplate.pdf
--- a/files/18_DisplayTemplate.pdf
+++ b/files/18_DisplayTemplate.pdf
--- a/files/19_EmailTemplate.pdf
+++ b/files/19_EmailTemplate.pdf
--- a/files/20_MiscTemplate.pdf
+++ b/files/20_MiscTemplate.pdf
--- a/files/21.pdf
+++ b/files/21.pdf
--- a/files/22.pdf
+++ b/files/22.pdf
--- a/files/23.pdf
+++ b/files/23.pdf
--- a/files/24.pdf
+++ b/files/24.pdf
--- a/files/25.pdf
+++ b/files/25.pdf
--- a/files/26_FileSaveTemplate.pdf
+++ b/files/26_FileSaveTemplate.pdf
--- a/files/27.pdf
+++ b/files/27.pdf
--- a/files/28.pdf
+++ b/files/28.pdf
--- a/files/29.pdf
+++ b/files/29.pdf
--- a/files/30_TerminalTemplate.pdf
+++ b/files/30_TerminalTemplate.pdf
--- a/files/31_PrintTemplate.pdf
+++ b/files/31_PrintTemplate.pdf
--- a/files/32.pdf
+++ b/files/32.pdf
--- a/files/33.pdf
+++ b/files/33.pdf
--- a/files/34.pdf
+++ b/files/34.pdf
--- a/files/35.pdf
+++ b/files/35.pdf
--- a/files/36.pdf
+++ b/files/36.pdf
--- a/files/37.pdf
+++ b/files/37.pdf
--- a/files/38.pdf
+++ b/files/38.pdf
--- a/files/39.pdf
+++ b/files/39.pdf
--- a/files/40.pdf
+++ b/files/40.pdf
--- a/files/41.pdf
+++ b/files/41.pdf
--- a/files/42.pdf
+++ b/files/42.pdf
--- a/files/43_TrashTemplate.pdf
+++ b/files/43_TrashTemplate.pdf
--- a/files/44.pdf
+++ b/files/44.pdf
--- a/files/45.pdf
+++ b/files/45.pdf
--- a/files/46.pdf
+++ b/files/46.pdf
--- a/files/47.pdf
+++ b/files/47.pdf
--- a/files/48_FolderTemplate.pdf
+++ b/files/48_FolderTemplate.pdf
--- a/files/49.pdf
+++ b/files/49.pdf
--- a/files/50.pdf
+++ b/files/50.pdf
--- a/files/51.pdf
+++ b/files/51.pdf
--- a/files/52.pdf
+++ b/files/52.pdf
--- a/files/53.pdf
+++ b/files/53.pdf
--- a/files/54.pdf
+++ b/files/54.pdf
--- a/files/55.pdf
+++ b/files/55.pdf
--- a/files/56.pdf
+++ b/files/56.pdf
--- a/files/57.pdf
+++ b/files/57.pdf
--- a/files/58.pdf
+++ b/files/58.pdf
--- a/files/59.pdf
+++ b/files/59.pdf
--- a/files/60.pdf
+++ b/files/60.pdf
--- a/files/61.pdf
+++ b/files/61.pdf
--- a/files/62.pdf
+++ b/files/62.pdf
--- a/files/63.pdf
+++ b/files/63.pdf
--- a/files/64.pdf
+++ b/files/64.pdf
--- a/files/65.pdf
+++ b/files/65.pdf
--- a/files/66.pdf
+++ b/files/66.pdf
--- a/files/67.pdf
+++ b/files/67.pdf
--- a/files/68_PhoneTemplate.pdf
+++ b/files/68_PhoneTemplate.pdf
--- a/files/89.pdf
+++ b/files/89.pdf
--- a/files/94.pdf
+++ b/files/94.pdf
--- a/files/95.pdf
+++ b/files/95.pdf
--- a/files/96.pdf
+++ b/files/96.pdf
--- a/files/99.pdf
+++ b/files/99.pdf
--- a/files/99_AddFolderTemplate.pdf
+++ b/files/99_AddFolderTemplate.pdf
--- a/files/99_InfoTemplate.pdf
+++ b/files/99_InfoTemplate.pdf
--- a/files/addEntryTemplate.pdf
+++ b/files/addEntryTemplate.pdf
--- a/Assets/Keepass
+++ b/Assets/Keepass
--- a/Assets/MacPass
+++ b/Assets/MacPass
--- a/Assets/MacPass
+++ b/Assets/MacPass
--- a/Assets/MacPass
+++ b/Assets/MacPass
--- a/Icons/C00_Password.png
+++ b/Icons/C00_Password.png
--- a/Icons/C01_Package_Network.png
+++ b/Icons/C01_Package_Network.png
--- a/Show More
+++ b/Show More