Commit Graph

3974 Commits

Author SHA1 Message Date
Armin Schrenk
ce96d1c65e
Merge pull request #2452 from chewitt1/chewitt-next-button
Fixes #2447
2022-09-21 21:31:33 +02:00
Carrima Hewitt
f02a8e14ff Fixed Trim and Bidirectional Bind 2022-09-21 11:11:00 -04:00
Sebastian Stenzel
49c3b1fa43
fix font loading warning visible in console
see https://stackoverflow.com/a/65127949/4014509
2022-09-21 13:20:34 +02:00
Sebastian Stenzel
cc24a4c9ae
Merge pull request #2445 from purejava/disable-keyrings
fixes #2047, fixes #2219
2022-09-21 09:12:40 +02:00
Ralph Plawetzki
1101a7574c
Beautify the code 2022-09-20 20:12:44 +02:00
Ralph Plawetzki
30de04e291
Move CheckBox (injected from JavaFX) below the final fields (injected by Dagger) 2022-09-20 20:12:43 +02:00
Ralph Plawetzki
2e3d2e86e2
Cut off the application from accessing keychains at the earliest point possible
as suggested in the discussion to #2445
2022-09-20 20:12:43 +02:00
Ralph Plawetzki
78cf082096
Rename properties as suggested in the discussion to #2445 2022-09-20 20:12:43 +02:00
Ralph Plawetzki
64c90f8107
Move checkbox to the front and rename members 2022-09-20 20:12:43 +02:00
Ralph Plawetzki
b34bf6f161
Handle further queries of the backend for disabled keyrings 2022-09-20 20:12:43 +02:00
Ralph Plawetzki
17d3d7307d
Wire disable all keyrings setting checkbox to the KeychainManager 2022-09-20 20:12:43 +02:00
Ralph Plawetzki
e6c7fed662
Add disable all keyrings setting checkbox
and connect it to the settings file
2022-09-20 20:12:42 +02:00
Ralph Plawetzki
23fad16742
Revert "Add disable all keyrings setting checkbox"
This reverts commit d037c6bc140495b5469c2a25ae2a7a2752bc35dc.
2022-09-20 20:12:42 +02:00
Ralph Plawetzki
ec794cdca2
Add disable all keyrings setting checkbox
and connect it to the settings file
2022-09-20 20:12:42 +02:00
Carrima Hewitt
2def9216ec Trimmed Vault Name StringProperty 2022-09-20 10:33:26 -04:00
Carrima Hewitt
4f9759af58 Merge branch 'chewitt-next-button' of https://github.com/chewitt1/cryptomator into chewitt-next-button 2022-09-20 10:20:10 -04:00
Carrima Hewitt
382f6b7851 Reverted Misc 2022-09-20 10:19:38 -04:00
Carrima Hewitt
d60eb470ea
Merge branch 'cryptomator:develop' into chewitt-next-button 2022-09-20 08:41:38 -04:00
Carrima Hewitt
97a61ef717 Removed Comments 2022-09-20 08:37:38 -04:00
Armin Schrenk
08fc5e9a77
Fixes #2454 2022-09-20 10:58:48 +02:00
Carrima Hewitt
4c96c285bf Fixed Next button for Invalid Vault Name 2022-09-19 21:17:48 -04:00
Edward Chow
0021f2d37c
Use 2x icon on Mac menu bar (#2345) (#2346)
* Use 2x icon on Mac menu bar

Use 2x icon on Mac menu bar

* Fix #2357

Changed Windows tray icon to 2x
2022-09-15 17:38:42 +02:00
Tobias Hagemann
31d32f2018
Added macOS ARM64 workflow (#2432) 2022-09-10 08:30:18 +02:00
Armin Schrenk
b9c087b48e
Merge pull request #2430 from youscam/patch-1
Update README.md
2022-09-07 09:53:52 +02:00
KAMAL AZZOUZI
797dbc0a57
Update README.md
Update Windows profile name
2022-09-07 00:52:40 +01:00
Armin Schrenk
46745d030b
[ci skip] fix winget release action 2022-08-31 18:12:59 +02:00
Armin Schrenk
3cdf124e54
Merge branch 'main' into develop
[ci skip]
2022-08-31 16:02:28 +02:00
Armin Schrenk
d37147c73e
Merge branch 'release/1.6.14' 2022-08-31 15:59:56 +02:00
Armin Schrenk
67dd1548cc
finalize release 2022-08-31 15:47:23 +02:00
Armin Schrenk
008bb38e30
preparing 1.6.14 2022-08-31 15:41:18 +02:00
Cryptobot
1be6128523
New Crowdin updates (#2350)
New translations strings.properties

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

[ci skip]
2022-08-31 15:17:19 +02:00
Armin Schrenk
b4f95c465a
Fixes #2408 2022-08-31 13:35:27 +02:00
Sebastian Stenzel
40fa961b9b
clean up module-info 2022-08-31 11:40:18 +02:00
Sebastian Stenzel
659123fe7a
regenerate keypair if .p12 _or_ keychain item is missing
it used to depend only on the keychain item
2022-08-31 11:25:25 +02:00
Sebastian Stenzel
2448963161
class does not need to be generic 2022-08-31 10:57:41 +02:00
Sebastian Stenzel
16c0431f6f
use release versions of slf4j + logback 2022-08-31 10:52:53 +02:00
Sebastian Stenzel
2d99d1bdd4
Adding EaseUS as a sponsor
[ci skip]
2022-08-31 10:46:11 +02:00
Sebastian Stenzel
86ed0d3c0e
Merge pull request #2390 from cryptomator/feature/slf4j-2
Upgrade to SLF4J 2.x and Logback 1.3.x
2022-08-12 09:53:27 +02:00
Sebastian Stenzel
0501b0ef39
fixed test 2022-08-11 18:23:33 +02:00
Sebastian Stenzel
2c2b208de7
no need to reset anything, since there is no previous config 2022-08-11 18:18:48 +02:00
Sebastian Stenzel
ec7ad0f479
use new ServiceLoader based log configurator 2022-08-11 18:14:54 +02:00
Sebastian Stenzel
5267a04491
make org.cryptomator.desktop an open module 2022-08-11 17:36:10 +02:00
Sebastian Stenzel
04714cd0de
make singleton Environment accessible outside of Dagger graph 2022-08-11 17:35:35 +02:00
Sebastian Stenzel
46dbe15e4a
update dependencies 2022-08-11 17:34:34 +02:00
Armin Schrenk
7abf167ba2
Merge pull request #2381 from cryptomator/feature/hub-handle-402
handle 402 error when authenticating with Cryptomator Hub
2022-08-09 10:55:41 +02:00
Armin Schrenk
44d19bdefe
Apply suggestions from code review
Co-authored-by: Tobias Hagemann <tobias.hagemann@skymatic.de>
2022-08-09 10:37:22 +02:00
Armin Schrenk
f84eef5639
actually use the scene in ui flow 2022-08-08 16:37:30 +02:00
Armin Schrenk
281f6f727f
show info for 402 response on unlock 2022-08-08 16:33:07 +02:00
Sebastian Stenzel
bf83df3cd3
Merge branch 'main' into develop
# Conflicts:
#	pom.xml

[ci skip]
2022-08-05 14:31:59 +02:00
Sebastian Stenzel
be4f6f2b9b Merge branch 'hotfix/1.6.13' 2022-08-05 14:31:25 +02:00