mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-21 04:01:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,635 Commits 36 Branches 214 Tags
4078abeb33b4f1f5ae0a439032c7c8c19ba4a64f
Commit Graph

4635 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastian Stenzel
4078abeb33 Merge branch 'feature/fix-macOS-build' into release/1.10.0 2023-08-01 09:42:29 +02:00
Armin Schrenk
27ca6591ea Apply suggestions from code review 
Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
 2023-07-26 13:01:14 +02:00
Armin Schrenk
ad3d36e06a check sha256 sum of downloaded artifact in ci 2023-07-26 11:37:05 +02:00
Armin Schrenk
83e91d361f fix errors in build script 2023-07-25 17:29:34 +02:00
Armin Schrenk
b73993c375 add jfx to module path 2023-07-25 14:43:29 +02:00
Armin Schrenk
a415e3b0a9 update local build script to download jfx jmods 2023-07-25 13:08:19 +02:00
Armin Schrenk
e41a33d250 fixes #3030 2023-07-25 13:07:40 +02:00
Armin Schrenk
108df3ddbc Merge branch 'main' into develop 
# Conflicts:
#	pom.xml
#	suppression.xml
 2023-07-24 16:38:18 +02:00
Armin Schrenk
9ca1ff1a2d Merge branch 'hotfix/1.9.2' 1.9.2 2023-07-24 16:35:33 +02:00
Armin Schrenk
164a350e7e finalize 1.9.2 2023-07-24 16:34:49 +02:00
Tobias Hagemann
b48ebd524b Merge pull request from GHSA-9c9p-c3mg-hpjq 
Fix LPE in win installer
 2023-07-24 16:23:23 +02:00
Armin Schrenk
7ba9d4de4f Merge branch 'hotfix/1.9.2' into feature/fix-lpe-win-installer 2023-07-24 16:21:54 +02:00
Armin Schrenk
807e718d13 supress non affecting cve 
(cherry picked from commit 4e3b2e0be0)
 2023-07-24 15:38:42 +02:00
Armin Schrenk
6efb839fd0 prepare 1.10.0 1.10.0-beta1 2023-07-24 15:00:28 +02:00
Cryptobot
ca71bb207f New Crowdin updates (#2945) 
New translations strings.properties

Arabic; Belarusian; Bengali; Bosnian; Bulgarian; Catalan; Chinese Simplified; Chinese Traditional; Chinese Traditional, Hong Kong; Croatian; Czech; Danish; Dutch; Filipino; Finnish; French; Galician; German; Greek; Hebrew; Hindi; Hungarian; Indonesian; Italian; Japanese; Korean; Latvian; Macedonian; Norwegian Bokmal; Norwegian Nynorsk; Persian; Polish; Portuguese; Portuguese, Brazilian; Punjabi; Romanian; Russian; Serbian (Cyrillic); Serbian (Latin); Sinhala; Slovak; Slovenian; Spanish; Swahili, Tanzania; Swedish; Tamil; Telugu; Thai; Turkish; Ukrainian; Vietnamese; 

[ci skip]
 2023-07-24 14:58:36 +02:00
Armin Schrenk
8ed1878035 prepare 1.9.2 2023-07-21 17:07:33 +02:00
Armin Schrenk
4e3b2e0be0 supress non affecting cve 2023-07-21 16:50:27 +02:00
JaniruTEC
ca3a11de90 Made AtomicReference to mountHandle final 
[ci skip]
 2023-07-21 16:37:08 +02:00
Armin Schrenk
c2819963d2 Replace custom actions executing bat files to by quiet exec custom actions to surpress shown command prompts 
Closes #GHSA-9c9p-c3mg-hpjq

(cherry picked from commit fb1ba6390dfcb7028be0eb051b893b744c0444dc)
 2023-07-21 16:05:21 +02:00
mindmonk
91ece74f57 Merge pull request #2998 from cryptomator/feature/update-reminder 
Update Reminder
 2023-07-21 09:46:48 +02:00
Jan-Peter Klein
b9f77cb1d6 Merge branch 'develop' into feature/update-reminder 2023-07-20 11:32:12 +02:00
Jan-Peter Klein
b6d09016cd rearranged layout elements and changed window width 2023-07-20 11:31:52 +02:00
Jan-Peter Klein
0a07103a4f moved logic of update checking from FxApplication class to UpdateReminderComponent 2023-07-20 11:06:55 +02:00
Jan-Peter Klein
96253f636a removed unused provide method 2023-07-20 11:05:50 +02:00
Armin Schrenk
bd932b1067 Fixes #3021 2023-07-18 17:06:03 +02:00
Jan-Peter Klein
ade277daf4 changed naming pattern and wording 2023-07-18 10:29:14 +02:00
Jan-Peter Klein
14776fc571 refactored UpdateReminderComponent.Builder to Factory 2023-07-17 15:40:11 +02:00
Jan-Peter Klein
c18f489e9d Merge branch 'develop' into feature/update-reminder 2023-07-17 15:32:25 +02:00
Jan-Peter Klein
bfc1e25335 some code cleanup 2023-07-17 12:23:23 +02:00
Jan-Peter Klein
4c2e6088a9 reformat code and optimized imports 2023-07-17 11:26:59 +02:00
Armin Schrenk
f1d4bd4cd4 Closes #2989 2023-07-13 12:22:46 +02:00
mindmonk
2a0e0738be Merge pull request #2987 from cryptomator/feature/custom-shortening-threshold 
Feature/custom shortening threshold
 2023-07-13 12:15:07 +02:00
Jan-Peter Klein
1fec9781bf Merge branch 'develop' into feature/custom-shortening-threshold 2023-07-12 16:07:03 +02:00
Jan-Peter Klein
886c69f298 reordered ui elements and added expert settings section to strings.properties 2023-07-12 16:04:29 +02:00
JaniruTEC
58c7774e0d Added arg3 to FormattedLabel 2023-07-11 21:50:52 +02:00
Jan-Peter Klein
df31b214f5 changed button wording from "Not now" to "Ask Me Later" 2023-07-11 15:23:50 +02:00
Jan-Peter Klein
25474ce014 changed wording and window size 2023-07-11 14:53:36 +02:00
Jan-Peter Klein
5f62f038d5 removed message below the input field and inserted in the invalid message 2023-07-11 14:41:43 +02:00
Jan-Peter Klein
eebba45909 added comment to explain code that sets shorteningThreshold to 0 
removed unnecessary introduction text
 2023-07-11 14:10:26 +02:00
Jan-Peter Klein
982e88d1c5 changed icon to question mark 2023-07-10 15:47:12 +02:00
Jan-Peter Klein
632d39bc9f added lastUpdateCheck to settings and integrated check in FXApplication start 2023-07-10 14:50:06 +02:00
Jan-Peter Klein
f25afb720f optimized isValidShorteningThreshold method and renamed DEFAULT_SHORTENING_THRESHOLD to MAX_SHORTENING_THRESHOLD 2023-07-10 13:14:58 +02:00
Jan-Peter Klein
bc361ea592 added ui elements for update reminder 2023-07-10 13:04:07 +02:00
Jan-Peter Klein
2202c91564 rearranged view 
added pencil icon
optimized code
cleaned up strings.properties
 2023-07-07 16:22:53 +02:00
Jan-Peter Klein
f817bc5378 implement requested changes from PR review 2023-07-06 11:03:34 +02:00
JaniruTEC
c30c90d2c3 Merge pull request #2985 from cryptomator/feature/2981-differ-options-preferences 
Fix 2981
 2023-07-05 16:27:55 +02:00
Jan-Peter Klein
09b638eafa pr mentioned changes implemented 2023-07-05 16:19:11 +02:00
JaniruTEC
91de0c1813 Added called to #showMainWindow 
See: https://github.com/cryptomator/cryptomator/pull/2985#discussion_r1252863161
 2023-07-05 15:50:35 +02:00
JaniruTEC
a3c953d437 Refactored decision model 
See: https://github.com/cryptomator/cryptomator/pull/2985#pullrequestreview-1514141146
 2023-07-05 15:49:43 +02:00
JaniruTEC
743da019f9 Cleaned up UnlockInvalidMountPointController 
See:
https://github.com/cryptomator/cryptomator/pull/2985#discussion_r1252868655
https://github.com/cryptomator/cryptomator/pull/2985#discussion_r1252874468
 2023-07-05 15:26:19 +02:00