Merge branch 'master' into dependabot/pip/requests-2.31.0

cryptoadvance · Jul 21, 2023 · 4b3dd82 · 4b3dd82
2 parents 7d223c9 + f8383ac
commit 4b3dd82
Show file tree

Hide file tree

Showing 22 changed files with 2,212 additions and 2,452 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,6 +23,7 @@ pyinstaller/version.txt
 pyinstaller/electron/version-data.json
 pyinstaller/electron/downloadloc.js
 pyinstaller/electron/node_modules
+pyinstaller/electron/package-lock.json
 pyinstaller/electron/dist
 pyinstaller/electron/fonts
 pyinstaller/electron/typography.css

diff --git a/package-lock.json b/package-lock.json
diff --git a/pyinstaller/electron/.prettierrc b/pyinstaller/electron/.prettierrc
@@ -0,0 +1,5 @@
+{
+  "singleQuote": true,
+  "semi": false,
+  "printWidth": 125
+}
diff --git a/pyinstaller/electron/build/entitlements.mac.plist b/pyinstaller/electron/build/entitlements.mac.plist
@@ -6,5 +6,22 @@
     <true/>
     <key>com.apple.security.device.camera</key>
     <true/>
+    <!-- 
+      this has been introduced with #2344
+      However it needs MAC provisioning profiles to be set up
+      And those trigger a App Review by Apple which we
+      currently want to avoid. Maybe later.
+    <key>CFBundleURLTypes</key>
+      <array>
+        <dict>
+          <key>CFBundleURLName</key>
+          <string>solutions.specter</string>
+          <key>CFBundleURLSchemes</key>
+          <array>
+            <string>specter</string>
+          </array>
+        </dict>
+      </array>
+    -->
   </dict>
 </plist>