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
Armin Schrenk
08fc5e9a77
Fixes #2454
2022-09-20 10:58:48 +02: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
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
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
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
Armin Schrenk
47f2d423b9
Remove code smells
2022-07-28 11:16:59 +02:00
Armin Schrenk
80b5b6af00
simplify app version code
2022-07-28 10:58:50 +02:00
Armin Schrenk
414c4e20b8
remove code smell
2022-07-28 10:47:46 +02:00
Armin Schrenk
8662abae5a
Merge branch 'feature/hub' into develop
...
# Conflicts:
# .idea/runConfigurations/Cryptomator_Windows.xml
# .idea/runConfigurations/Cryptomator_Windows_Dev.xml
# dist/win/build.ps1
# src/main/java/org/cryptomator/common/Environment.java
2022-07-26 12:29:33 +02:00
Armin Schrenk
10b9e75972
degenerify button description and rename things in resetPasswordController
2022-07-19 16:36:32 +02:00
Armin Schrenk
00e420a248
Improve add vault wizard:
...
* adjust ok/not-ok-design to other textfields
* add info, what characters to use
2022-07-19 15:51:58 +02:00
Armin Schrenk
f1c8e3d3f2
Change CatchingExecutor:
...
* ignore cancellation exception
* remove assertion (Closes #2270 )
2022-07-18 12:22:57 +02:00
Armin Schrenk
cfc8c7bed7
remove unused instance var
2022-07-18 12:15:48 +02:00
Armin Schrenk
71b876b32d
Fixes #1900
2022-07-18 11:42:12 +02:00
Armin Schrenk
cdc60abf66
Fixes #2292
2022-07-18 10:23:12 +02:00
Armin Schrenk
d814c1cfca
Update integrations-win lib ( #2331 )
...
* update to integrations-win 1.1.2
* refactor environment class to reduce maintenance
* fix test
Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com >
2022-07-11 15:59:54 +02:00
barimess
5ec499ff01
updated links to the latest version.
...
updated links from 1.5 to 1.6
2022-07-08 18:30:49 +01:00
Armin Schrenk
a7fc8d6fc4
hide alreadyExistingLabel when deviceName changed by user
2022-07-08 12:03:38 +02:00
Armin Schrenk
5c31a34d5f
Show message in register dialog if device name is already in use
2022-07-08 11:33:59 +02:00
Armin Schrenk
67264c0d8c
Merge pull request #2319 from cryptomator/feature/hub-better-dialogs
...
Improve Hub dialogs
2022-07-07 20:54:11 +02:00
Armin Schrenk
0e853b25f7
simplify the prefill of device registration name textbox
2022-07-07 17:54:53 +02:00
Jan-Peter Klein
ea6318dfc4
comments of the PR were taken into account as well as a few small changes in the recoverykey recover dialog
2022-07-07 16:17:41 +02:00
Armin Schrenk
93500a4efd
use try-with-resource
2022-07-07 12:27:20 +02:00
Jan-Peter Klein
b132bb6412
implemented recoverykey reset password success notification screen
2022-07-07 12:16:04 +02:00
Armin Schrenk
cf38a10284
Change text from registration to "naming" and prefill device name
2022-07-07 12:01:34 +02:00
Jan-Peter Klein
29d0e258f1
deleted unused and unnecessary code in QuitController
2022-07-05 16:30:32 +02:00
Jan-Peter Klein
9e18215d10
removed unused method, del .idea/uiDesigner.xml and code cleanup
2022-07-05 16:17:42 +02:00
Jan-Peter Klein
683276a6c6
switch scene in quitDialog to quitForcedDialog instead of init new window
2022-07-05 14:22:05 +02:00
Armin Schrenk
c191df9ee3
add device registration failed controller
2022-07-05 11:20:52 +02:00
Armin Schrenk
a2d6db0415
Add device registrations success screen
2022-07-05 11:09:29 +02:00
Armin Schrenk
077825f98a
Add desgin to recieve key dialog
2022-07-05 09:29:49 +02:00
Armin Schrenk
381c1cd8d3
Bump tinyoauth2 dependecy and adjust to new api
2022-07-04 17:15:00 +02:00
Armin Schrenk
e011a98fa0
add window title to hub keyloading
2022-07-04 10:36:15 +02:00
Armin Schrenk
9386804216
redesign auth processing dialog:
...
* adjust to new design
* add translation keys
2022-07-04 10:33:58 +02:00
Jan-Peter Klein
b791df01f7
removed quitforced package, moved QuitForcedController into quit package and deleted not required files
2022-06-30 15:41:33 +02:00
Jan-Peter Klein
376733106b
Merge branch 'develop' into feature/lock-and-quit-without-asking
...
# Conflicts (solved):
# src/main/resources/i18n/strings.properties
2022-06-30 15:22:57 +02:00
Jan-Peter Klein
8e6d2cf45a
Merge branch 'develop' into feature/lock-and-quit-without-asking
2022-06-30 15:13:06 +02:00