mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-24 21:51:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,056 Commits 36 Branches 214 Tags
e097bea1f55eb12feeb01f7a8001f2bad72a0cbb
Commit Graph

262 Commits

Author SHA1 Message Date
Armin Schrenk
e097bea1f5 adjust stats alignment 2022-12-01 13:28:36 +01:00
Armin Schrenk
920866b1a1 Merge branch 'develop' into feature/stats-counter-for-metadata 
# Conflicts:
#	pom.xml
 2022-12-01 12:44:09 +01:00
Cryptobot
d4ab17b38c New Crowdin updates (#2427) 
[ci skip]
 2022-10-06 16:11:29 +02:00
Armin Schrenk
ce96d1c65e Merge pull request #2452 from chewitt1/chewitt-next-button 
Fixes #2447
 2022-09-21 21:31:33 +02:00
Sebastian Stenzel
49c3b1fa43 fix font loading warning visible in console 
see https://stackoverflow.com/a/65127949/4014509
 2022-09-21 13:20:34 +02:00
Ralph Plawetzki
78cf082096 Rename properties as suggested in the discussion to #2445 2022-09-20 20:12:43 +02:00
Ralph Plawetzki
64c90f8107 Move checkbox to the front and rename members 2022-09-20 20:12:43 +02:00
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
Carrima Hewitt
4c96c285bf Fixed Next button for Invalid Vault Name 2022-09-19 21:17:48 -04:00
Cryptobot
1be6128523 New Crowdin updates (#2350) 
New translations strings.properties

Arabic; Belarusian; Bengali; Bosnian; Catalan; Chinese Simplified; Chinese Traditional; Chinese Traditional (Hong Kong); Croatian (Cyrillic); Czech; Danish; Dutch; Filipino; French; Galician; German; Greek; Hebrew; Hindi; Hungarian; Indonesian; Italian; Japanese; Korean (Latin); Latvian; Macedonian; Norwegian Bokmal; Norwegian Nynorsk; Persian; Polish; Portuguese; Portuguese, Brazilian; Punjabi; Romanian; Russian; Sinhala; Slovak; Spanish; Swahili, Tanzania; Swedish; Tamil; Telugu; Thai; Turkish; Ukrainian; Vietnamese; 

[ci skip]
 2022-08-31 15:17:19 +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
281f6f727f show info for 402 response on unlock 2022-08-08 16:33:07 +02:00
Armin Schrenk
80b5b6af00 simplify app version code 2022-07-28 10:58:50 +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
Cryptobot
f98782ba4e New Crowdin updates (#2313) 
New translations strings.properties

Arabic; Belarusian; Bengali; Bosnian; Catalan; Chinese Simplified; Chinese Traditional; Chinese Traditional, Hong Kong; Croatian; Serbian (Cyrillic); Czech; Dutch; Filipino; French; Galician; German; Greek; Hebrew; Hindi; Hungarian; Indonesian; Italian; Japanese; Korean (Latin); Latvian; Macedonian; Norwegian Bokmal; Norwegian Nynorsk; Persian; Polish; Portuguese; Portuguese, Brazilian; Punjabi; Romanian; Russian; Sinhala; Slovak; Spanish; Swahili, Tanzania; Swedish; Tamil; Telugu; Thai; Turkish; Ukrainian; Vietnamese; 

[ci skip]
 2022-07-26 12:14:32 +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
5c31a34d5f Show message in register dialog if device name is already in use 2022-07-08 11:33:59 +02: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
Armin Schrenk
cf38a10284 Change text from registration to "naming" and prefill device name 2022-07-07 12:01:34 +02:00
Armin Schrenk
73442cddc8 Change register device dialog text to make intent clear 2022-07-06 10:41:13 +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
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
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
Armin Schrenk
63cd3a02de Merge branch 'develop' into feature/hub 2022-06-30 12:13:29 +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
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
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
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