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
Jan-Peter Klein
69fe5b8c27
changed buttonOrder and buttonData in recovery_reset_password.fxml and removed blank line in string.properties
2022-07-07 17:23:10 +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
Jan-Peter Klein
b132bb6412
implemented recoverykey reset password success notification screen
2022-07-07 12:16:04 +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
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
c8e4ed1ce4
Merge branch 'feature/translations' into feature/1430-embark-on-unity
...
# Conflicts:
# src/main/resources/i18n/strings_de.properties
# src/main/resources/i18n/strings_pl.properties
# src/main/resources/i18n/strings_pt_BR.properties
# src/main/resources/i18n/strings_zh_TW.properties
2022-06-30 10:20:44 +02:00
Armin Schrenk
99b25d0792
migrate translations
2022-06-30 10:00:22 +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
Tobias Hagemann
43e6ca41aa
more consistency
2022-06-29 11:34:07 +02:00
Armin Schrenk
e2b4566174
Update src/main/resources/i18n/strings.properties
...
Co-authored-by: Tobias Hagemann <tobias.hagemann@skymatic.de >
2022-06-29 11:15:26 +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
09550b77dc
Merge branch 'feature/1430-embark-on-unity' of https://github.com/cryptomator/cryptomator into feature/1430-embark-on-unity
2022-06-29 10:54:59 +02:00
Armin Schrenk
3bd43908ac
Apply suggestions from code review
...
Co-authored-by: Tobias Hagemann <tobias.hagemann@skymatic.de >
2022-06-29 10:54:42 +02:00
Armin Schrenk
f69efb85a5
more translation adjustments
2022-06-29 10:54:17 +02:00
Armin Schrenk
bc5091a0d7
adjust forget password dialog
2022-06-29 10:52:39 +02:00
Armin Schrenk
a199a2a06b
add ux todo
2022-06-29 10:08:18 +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
2b19fd6852
adjust lock failed dialog
2022-06-28 10:32:47 +02:00
Armin Schrenk
a5e9837c99
Adjust design of unlock invalid mp dialog
2022-06-28 10:15:39 +02:00
Armin Schrenk
81a1052a76
cleanup
2022-06-27 19:08:00 +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
fd3c8d7f78
Adjust design of lock_forced dialog
2022-06-27 18:07:41 +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
Armin Schrenk
07cfef2e41
adjust design of auth for recovery key
2022-06-27 17:21:45 +02:00
Armin Schrenk
35c5bd03de
Changed design for unlock success dialog
2022-06-27 16:26:35 +02:00
Jan-Peter Klein
7cc1a1728c
removed unused parameter
2022-06-27 14:40:20 +02:00
Cryptobot
a79bf1952d
New translations strings.properties (Vietnamese)
...
[ci skip]
2022-06-25 18:41:43 +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
22b842e6c2
Rename styleclass
2022-06-24 12:27:38 +02:00
Cryptobot
ca426f6535
New translations strings.properties (Vietnamese)
...
[ci skip]
2022-06-22 17:10:33 +02:00
Cryptobot
3580728a5a
New translations strings.properties (Hindi)
...
[ci skip]
2022-06-21 12:42:13 +02:00