mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-06-09 21:52:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,138 Commits 30 Branches 215 Tags
a30db34c1994e94de85f8e8fc59166add04424d3
Commit Graph

5138 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastian Stenzel c03bc9ed0b removed unused imports 
[ci skip]
 2022-04-05 07:47:54 +02:00
Sebastian Stenzel 7c772e2767 removed user.language=en and jdk.gtk.version=2 flags from run configurations 
[ci skip]
 2022-04-05 07:46:17 +02:00
Sebastian Stenzel 3136e22414 Merge pull request #2150 from cryptomator/feature/language-switcher 2022-04-04 20:59:23 +02:00
Sebastian Stenzel 508b9f5c64 test if bundle for supported locales exist and are not empty 2022-04-04 15:57:01 +02:00
Sebastian Stenzel d10c8fcf17 amend settings deserialization test 2022-04-04 15:13:27 +02:00
Sebastian Stenzel ceb3cbc43f remove unused imports 2022-04-04 15:10:35 +02:00
Sebastian Stenzel ec909ce723 rethrow AWTException as TrayMenuException 2022-04-04 15:10:24 +02:00
Sebastian Stenzel 2ce7e84e3c Merge branch 'develop' into feature/gtk2-launcher 2022-04-04 06:58:07 +02:00
Sebastian Stenzel d7da78fc07 adjust to latest API 2022-04-03 15:26:04 +02:00
Sebastian Stenzel e93e31e745 Merge branch 'develop' into feature/integrations-api-1.1.0 
# Conflicts:
#	pom.xml
#	src/main/java/org/cryptomator/ui/launcher/UiLauncherModule.java
#	src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
#	src/main/java/org/cryptomator/ui/traymenu/TrayMenuController.java
#	src/main/resources/license/THIRD-PARTY.txt
 2022-04-03 12:53:08 +02:00
Sebastian Stenzel 5dc8fd2582 made constant final 2022-04-03 12:25:15 +02:00
Sebastian Stenzel 77d81acb1e added "English" as first option 2022-04-02 15:54:37 +02:00
Sebastian Stenzel 71d346eddd apply chosen language at application start 2022-04-02 12:17:10 +02:00
Sebastian Stenzel d9aa6ae91a display "language" chooser in general preferences 2022-04-02 12:16:57 +02:00
Sebastian Stenzel c130441700 add setting for user-chosen "language" 2022-04-02 12:15:09 +02:00
Sebastian Stenzel 6af016f1fe log errors occuring in async "show window" tasks 2022-04-02 11:51:34 +02:00
Sebastian Stenzel ec2524f6ff use correct StartupWMClass (fixes #1955) 
[ci skip]
 2022-04-02 10:06:15 +02:00
Sebastian Stenzel 27d4e00210 Merge branch 'develop' into feature/gtk2-launcher 2022-04-02 10:01:25 +02:00
Sebastian Stenzel 0cd2ecb0b3 Merge pull request #2139 from cryptomator/feature/javafx-launcher 
Refactored Launcher Component Graph
 2022-04-02 09:59:45 +02:00
Sebastian Stenzel a143ecdcf8 Refactored use of StageFactory 2022-04-01 17:42:29 +02:00
Sebastian Stenzel 2d830cdb31 easier-to-understand if/else for combinations of "startHidden" and "hasTrayIcon" 
fixes bug when startHidden was false and hasTrayIcon was true
 2022-04-01 15:36:20 +02:00
Sebastian Stenzel 887e0332da changed misleading comment 
[ci skip]
 2022-04-01 14:50:27 +02:00
Sebastian Stenzel c1504e29c1 added documentation 
[ci skip]
 2022-04-01 14:48:14 +02:00
Sebastian Stenzel 0bb6e64d83 when "starting hidden", only minimize when there is no tray icon 2022-04-01 14:01:58 +02:00
Sebastian Stenzel c7d1b9dbd6 don't prompt user if quitting directly after app start 2022-03-31 16:32:17 +02:00
Armin Schrenk a4c50da222 replicate naming scheme of win exe installer in CI job to local build 2022-03-31 11:12:50 +02:00
Sebastian Stenzel a558135fec Rename .exe Installer Bundle (#2145) 2022-03-31 11:03:15 +02:00
Sebastian Stenzel 7df449524a fixed lock workflow 2022-03-31 10:03:02 +02:00
Sebastian Stenzel d475444829 fixed some code smells 2022-03-31 09:59:16 +02:00
Sebastian Stenzel 828f32d3f6 Merge branch 'develop' into feature/gtk2-launcher 2022-03-31 08:57:27 +02:00
Sebastian Stenzel dc6b5774b8 Merge branch 'develop' into feature/javafx-launcher 
# Conflicts:
#	pom.xml
 2022-03-31 08:55:49 +02:00
Sebastian Stenzel 28db04e621 arm av allowlisting 
[ci skip]
 2022-03-31 08:37:00 +02:00
Sebastian Stenzel e2184ec009 upload .msi and .exe to AV allowlisting servers 2022-03-31 08:20:49 +02:00
Sebastian Stenzel 5f1f95da74 Merge branch 'main' into develop 
[ci skip]
 2022-03-31 08:05:53 +02:00
Sebastian Stenzel 4b29f0b4f3 Merge branch 'release/1.6.8' 1.6.8 2022-03-30 18:03:54 +02:00
Sebastian Stenzel f8bcbda8d7 add safeguard to prevent release in case of missing signature 2022-03-30 18:03:15 +02:00
Sebastian Stenzel e368087c3e Merge branch 'develop' into release/1.6.8 2022-03-30 18:02:13 +02:00
Sebastian Stenzel ddb5da1d79 reintroduce condition for signing the tarball 
[ci skip]
 2022-03-30 17:56:01 +02:00
Sebastian Stenzel d2374fb8cd deleted yet another use of github.ref 2022-03-30 17:50:45 +02:00
Sebastian Stenzel c73aa49b59 always run the tarball signature step (for testing ${{ github.ref_name }}) 2022-03-30 17:46:31 +02:00
Armin Schrenk de86760a75 Merge branch 'release/1.6.8' 2022-03-30 17:23:49 +02:00
Armin Schrenk bfd8a62015 preparing 1.6.8 2022-03-30 17:22:25 +02:00
Julian Raufelder 9292a3c89c Sign again tarball in release using GPG (#2140) 
Co-authored-by: infeo <armin.schrenk@skymatic.de>
Co-authored-by: overheadhunter <sebastian.stenzel@skymatic.de>
 2022-03-30 17:19:27 +02:00
Julian Raufelder 732fc2f3dd Update metainfo.xml to 1.6.8 
[ci skip]
 2022-03-30 17:17:48 +02:00
Cryptobot 9fb00fcc38 New Crowdin updates (#2119) 
New translations strings.properties

Chinese Traditional; German; 

[ci skip]
 2022-03-30 17:16:49 +02:00
Armin Schrenk 12b58a8a32 Update third-party license file 2022-03-30 17:10:10 +02:00
Armin Schrenk 338eb45e24 bump dependencies 2022-03-30 16:17:06 +02:00
Armin Schrenk e8c63dd3f3 Fixes #2138, closes #2127 
Return code 0 when running application found
 2022-03-30 16:00:05 +02:00
Armin Schrenk 2de23f8fff bump jwt lib to fix possible vulnerability 2022-03-30 15:56:22 +02:00
Armin Schrenk 1a0624cc81 Closes #2130 
Prevent Windows installation if app is running
 2022-03-29 23:47:03 +02:00