mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-17 10:11:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,797 Commits 36 Branches 214 Tags
b791df01f70f89122e524745f06dd45f4fc0bef3
Commit Graph

3797 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
1795a7aaa4 Merge pull request #2311 from cryptomator/feature/1430-embark-on-unity 
Embark on unity.

Closes #1430
 2022-06-30 11:07:25 +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
Tobias Hagemann
8043a4ea10 Update README.md 2022-06-22 10:42:59 +02:00
Tobias Hagemann
e5cb271e28 Update README.md 2022-06-22 10:42:13 +02:00
Cryptobot
3580728a5a New translations strings.properties (Hindi) 
[ci skip]
 2022-06-21 12:42:13 +02:00
Cryptobot
749c5d9f24 New translations strings.properties (Vietnamese) 
[ci skip]
 2022-06-21 00:39:49 +02:00
Cryptobot
6ae872fa85 New translations strings.properties (Vietnamese) 
[ci skip]
 2022-06-20 21:27:37 +02:00
Cryptobot
773fa9804a New translations strings.properties (Hindi) 
[ci skip]
 2022-06-20 14:07:39 +02:00
Cryptobot
cfa9beec8b New translations strings.properties (Hindi) 
[ci skip]
 2022-06-20 11:11:16 +02:00
Cryptobot
5f4d13f662 New translations strings.properties (Japanese) 
[ci skip]
 2022-06-20 04:29:20 +02:00
Cryptobot
f0d69b645b New translations strings.properties (Hindi) 
[ci skip]
 2022-06-19 13:23:39 +02:00
Cryptobot
797724e640 New translations strings.properties (Portuguese, Brazilian) 
[ci skip]
 2022-06-17 01:12:50 +02:00
Cryptobot
3488db8c0e New translations strings.properties (Vietnamese) 
[ci skip]
 2022-06-15 21:47:37 +02:00