Magic-Mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2024-12-02 17:16:26 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
3,974 Commits 26 Branches 187 Tags 36 MiB
ce96d1c65e
Commit Graph

3974 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastian Stenzel
df099df334
Create error-db.yml 
Eventually append discussion data to error database
 2022-07-07 17:13:27 +02:00
Jan-Peter Klein
6bbdb4baa0 Merge branch 'develop' into feature/recoverykey-success-notification 2022-07-07 16:18:26 +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
Sebastian Stenzel
15781b685d
use new github "inputs" context, where booleans are supposed to actually be booleans 
see https://github.com/actions/runner/issues/1483
see https://docs.github.com/en/actions/learn-github-actions/contexts#inputs-context

[ci skip]
 2022-07-06 17:09:02 +02:00
Armin Schrenk
73442cddc8
Change register device dialog text to make intent clear 2022-07-06 10:41:13 +02:00
mindmonk
bce9833929
Merge pull request #2273 from cryptomator/feature/lock-and-quit-without-asking 
implemented functionality of feature request issue #1713 "On closing …
 2022-07-05 16:46:45 +02:00
Jan-Peter Klein
29d0e258f1 deleted unused and unnecessary code in QuitController 2022-07-05 16:30:32 +02:00
Jan-Peter Klein
1305e45564 Merge branch 'develop' into feature/lock-and-quit-without-asking 2022-07-05 16:18:06 +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
Sebastian Stenzel
f16a30ef29
Merge branch 'develop' into feature/hub 
# Conflicts:
#	pom.xml
 2022-07-05 13:28:41 +02:00
Sebastian Stenzel
82db3b59fb
bump jwt dependency 2022-07-05 13:22:43 +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
ae2c67a88b
fit unauthorized device dialog to new design 2022-07-04 11:50:07 +02:00
Armin Schrenk
3ce0270cde
Adjust hub register device to new design 2022-07-04 11:37:49 +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
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