From 60e0b124db4ad60e99bc6f9c75e70d4ddb201fde Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Wed, 9 Oct 2024 12:30:13 +0000
Subject: [PATCH] [stage]

---
 .../java/io/xpipe/app/prefs/AppPrefs.java     |  2 +-
 dist/changelogs/12.2.md                       | 43 +++++++++++++++++++
 dist/changelogs/12.2_incremental.md           | 14 ++++++
 version                                       |  2 +-
 4 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 dist/changelogs/12.2.md
 create mode 100644 dist/changelogs/12.2_incremental.md

diff --git a/app/src/main/java/io/xpipe/app/prefs/AppPrefs.java b/app/src/main/java/io/xpipe/app/prefs/AppPrefs.java
index d28ad29f2..7d74d7ed4 100644
--- a/app/src/main/java/io/xpipe/app/prefs/AppPrefs.java
+++ b/app/src/main/java/io/xpipe/app/prefs/AppPrefs.java
@@ -521,7 +521,7 @@ private void fixInvalidLocalValues() {
         }
 
         // Fix erroneous fallback shell set on macOS
-        if (OsType.getLocal() == OsType.MACOS && AppProperties.get().getVersion().equals("12.1.1") && XPipeSession.get().isNewBuildSession()) {
+        if (OsType.getLocal() == OsType.MACOS && AppProperties.get().getCanonicalVersion().map(v -> v.getMajor() == 12 && v.getMinor() == 2).orElse(false) && XPipeSession.get().isNewBuildSession()) {
             useLocalFallbackShell.setValue(false);
         }
 
diff --git a/dist/changelogs/12.2.md b/dist/changelogs/12.2.md
new file mode 100644
index 000000000..a4b4ecfa2
--- /dev/null
+++ b/dist/changelogs/12.2.md
@@ -0,0 +1,43 @@
+## Changes
+
+- Add popup to automatically save file with sudo when permissions are denied in file browser
+- You can now restart any ended terminal session by pressing R in the terminal
+- Add support for the windows credential manager as a password manager
+- Reuse existing shell session when adding new connection and searching for available connections
+- Implement support for setting custom icons, thanks to [https://github.com/selfhst/icons](https://github.com/selfhst/icons)
+- Replace deprecated wmic tool interaction on Windows
+- Add button to log in as a different user for RDP tunnel connections
+- Properly terminate all running connections when shutting down
+- Improve color scheme contrast for light themes
+- Improve connection hub styling
+- Rework Windows OS name detection
+- Improve script summary display
+- Upgrade to GraalVM 22.0.2
+- There is now a docker image with a web-based desktop environment for XPipe at [https://github.com/xpipe-io/xpipe-webtop](https://github.com/xpipe-io/xpipe-webtop)
+
+## Fixes
+
+- Fix csh, opnsense, pfsense shells being broken
+- Fix VM start/stop actions only being visible when user credentials were supplied
+- Fix tunnels failing to start when the remote login shell was fish
+- Fix dashlane password manager configuration being wrong
+- Fix some shell sessions staying open in the background when closing connection creation dialog
+- Fix SSH bridge not launching on Linux with missing sshd
+- Fix browser transfer progress flickering
+- Fix powershell type not being able to be recognized in certain language modes
+- Fix Cygwin/Msys2/GitForWindows not showing up in connection search sometimes
+- Fix some startup checks not working
+- Fix scrollbar not resetting when changing application tabs
+- Fix file modified dates and color names not being translated
+
+## Git vault improvements
+
+- Add more extensive documentation to the remote git repository settings menu
+- Add restart button to the sync settings menu
+- Improve git failure messages
+- Fix git CLI check not working on macOS due to xcode-select
+- Fix git sync failing when multiple gpg programs were present in PATH
+
+## Product hunt
+
+XPipe will be on ProductHunt on October 22. If you interested, you can follow XPipe at [https://www.producthunt.com/products/xpipe](https://www.producthunt.com/products/xpipe) to get notified.
diff --git a/dist/changelogs/12.2_incremental.md b/dist/changelogs/12.2_incremental.md
new file mode 100644
index 000000000..ddfbcb53b
--- /dev/null
+++ b/dist/changelogs/12.2_incremental.md
@@ -0,0 +1,14 @@
+- Add new rename file conflict action in file browser
+- This release fixes an issue on macOS where XPipe defaulted to sh instead of zsh.
+  There seems to be some bugs in macOS 15 where the spawning of external programs fails sometimes,
+  leading XPipe to believe that zsh does not work correctly.
+  XPipe will now no longer fall back to sh and instead fail to start,
+  with the hope that on the next start the process spawning issue won't occur again.
+- Fix tooltip dropshadows not working in webtop
+- Fix XPipe not being in taskbar by default in webtop
+- Fix file browser transfer progress being wrong for files < 1kb
+- Show proper error when a source file gets deleted while a transfer is in progress
+- Fix empty storage directory setting leading to startup crash
+- Fix update script reporting syntax error on zsh
+- Fix NullPointers when a script had no commands on its own
+- Improve some error vague messages
diff --git a/version b/version
index 40e6bd96a..db8fab68a 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-12.1
+12.2-1