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
Armin Schrenk
63cd3a02de
Merge branch 'develop' into feature/hub
2022-06-30 12:13:29 +02:00
Jan-Peter Klein
e640e36744
show forced dialog if normal lock and quit fails in quit dialog
2022-06-29 15:27:19 +02:00
Jan-Peter Klein
d10d8fb208
implemented force quit dialog
2022-06-29 15:12:43 +02:00
Armin Schrenk
d203db8075
Apply suggestions from code review
...
Co-authored-by: Tobias Hagemann <tobias.hagemann@skymatic.de >
2022-06-29 11:14:14 +02:00
Armin Schrenk
7c4f5b28a7
use correct translation key
2022-06-29 11:10:55 +02:00
Armin Schrenk
7edd1dfa40
Reintegrate forget password dialog into application
2022-06-29 11:10:15 +02:00
Armin Schrenk
dffd4d9dd9
change translation keys to use unified dialog scheme
2022-06-29 10:07:03 +02:00
Armin Schrenk
737d98775b
Revert "rename recovery_create.fxml file"
...
This reverts commit 78e458f01a
2022-06-28 16:41:53 +02:00
Armin Schrenk
bee9c9f452
closes #1713
...
quit application by locking open vaults, if user wished so.
2022-06-28 15:39:04 +02:00
Armin Schrenk
ab2d740722
adjust choose masterkeyfile dialog
2022-06-27 19:04:14 +02:00
Armin Schrenk
bf3a62a6b4
Rename translation key for unlock window title
2022-06-27 18:56:53 +02:00
Armin Schrenk
d163d02077
Change window title for removeVault dialog
2022-06-27 18:49:26 +02:00
Armin Schrenk
677607d210
adjust remove vault dialog
2022-06-27 18:24:54 +02:00
Armin Schrenk
cce74ef5e4
add TODO
2022-06-27 17:52:49 +02:00
Armin Schrenk
74058238ec
adjust design of wrong file alert
2022-06-27 17:52:34 +02:00
Armin Schrenk
78e458f01a
rename recovery_create.fxml file
2022-06-27 17:26:21 +02:00
Jan-Peter Klein
7cc1a1728c
removed unused parameter
2022-06-27 14:40:20 +02:00
Armin Schrenk
c7ad587aa2
Changed design for quit screen as template for other dialogs
2022-06-24 15:34:01 +02:00
Armin Schrenk
f96c52cdb1
Disable Password tab if vault.config.keyid.scheme is not masterkeyfile
2022-06-24 10:26:34 +02:00
Armin Schrenk
45f038bae2
Merge branch 'develop' into feature/hub
...
# Conflicts:
# dist/mac/dmg/build.sh
# dist/win/build.ps1
# pom.xml
2022-06-22 09:55:02 +02:00
Armin Schrenk
8c65bd19c2
Make FUSE the default volume impl
2022-06-13 10:00:14 +02:00
