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

396 Commits

Author SHA1 Message Date
Armin Schrenk
9cec45dc1f Add context menu to copy single result info 2022-11-29 14:18:43 +01:00
Armin Schrenk
5f55530b4a Add filters to results list 2022-11-29 13:49:11 +01:00
Armin Schrenk
96de2556a9 apply correct style class on check icon 2022-11-28 15:00:16 +01:00
Armin Schrenk
4dc1d59305 Implement fix all button 2022-11-25 17:17:55 +01:00
Armin Schrenk
d896fe21b5 adapt result fixing to new api 2022-11-24 10:13:37 +01:00
Armin Schrenk
13debaafbe set loopback alias in Cryptomator app during build time 2022-11-18 13:34:38 +01:00
Sebastian Stenzel
c79cfe1c9d Merge branch 'develop' into feature/javafx-19 
# Conflicts:
#	pom.xml
 2022-10-26 11:43:07 +02:00
Armin Schrenk
01a6475d5f replace deprecated method call 2022-10-17 17:13:12 +02:00
Sebastian Stenzel
8040b71a51 simplified some more bindings 2022-10-10 12:09:30 +02:00
Sebastian Stenzel
76e7a0a7b8 bump OpenJFX to version 19 
replaced EasyBind with `ObservableValue.map()` where possible
 2022-10-10 10:24:42 +02:00
Sebastian Stenzel
672b4aee2d added Belgian, Danish, Farsi, Sinhala, Vietnamese to language chooser 2022-10-06 16:19:16 +02:00
Julian Raufelder
da2f97b1c4 Fix communitcation with hub if it supports only HTTP version 1.1 2022-10-06 09:38:02 +02:00
Armin Schrenk
ce96d1c65e Merge pull request #2452 from chewitt1/chewitt-next-button 
Fixes #2447
 2022-09-21 21:31:33 +02:00
Carrima Hewitt
f02a8e14ff Fixed Trim and Bidirectional Bind 2022-09-21 11:11:00 -04:00
Ralph Plawetzki
1101a7574c Beautify the code 2022-09-20 20:12:44 +02:00
Ralph Plawetzki
30de04e291 Move CheckBox (injected from JavaFX) below the final fields (injected by Dagger) 2022-09-20 20:12:43 +02:00
Ralph Plawetzki
2e3d2e86e2 Cut off the application from accessing keychains at the earliest point possible 
as suggested in the discussion to #2445
 2022-09-20 20:12:43 +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
b34bf6f161 Handle further queries of the backend for disabled keyrings 2022-09-20 20:12:43 +02:00
Ralph Plawetzki
17d3d7307d Wire disable all keyrings setting checkbox to the KeychainManager 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
2def9216ec Trimmed Vault Name StringProperty 2022-09-20 10:33:26 -04:00
Carrima Hewitt
d60eb470ea Merge branch 'cryptomator:develop' into chewitt-next-button 2022-09-20 08:41:38 -04:00
Carrima Hewitt
97a61ef717 Removed Comments 2022-09-20 08:37:38 -04:00
Armin Schrenk
08fc5e9a77 Fixes #2454 2022-09-20 10:58:48 +02:00
Carrima Hewitt
4c96c285bf Fixed Next button for Invalid Vault Name 2022-09-19 21:17:48 -04:00
Edward Chow
0021f2d37c Use 2x icon on Mac menu bar (#2345) (#2346) 
* Use 2x icon on Mac menu bar

Use 2x icon on Mac menu bar

* Fix #2357

Changed Windows tray icon to 2x
 2022-09-15 17:38:42 +02:00
Armin Schrenk
b4f95c465a Fixes #2408 2022-08-31 13:35:27 +02:00
Sebastian Stenzel
40fa961b9b clean up module-info 2022-08-31 11:40:18 +02:00
Sebastian Stenzel
659123fe7a regenerate keypair if .p12 _or_ keychain item is missing 
it used to depend only on the keychain item
 2022-08-31 11:25:25 +02:00
Sebastian Stenzel
2448963161 class does not need to be generic 2022-08-31 10:57:41 +02:00
Sebastian Stenzel
16c0431f6f use release versions of slf4j + logback 2022-08-31 10:52:53 +02:00
Sebastian Stenzel
2c2b208de7 no need to reset anything, since there is no previous config 2022-08-11 18:18:48 +02:00
Sebastian Stenzel
ec7ad0f479 use new ServiceLoader based log configurator 2022-08-11 18:14:54 +02:00
Sebastian Stenzel
5267a04491 make org.cryptomator.desktop an open module 2022-08-11 17:36:10 +02:00
Sebastian Stenzel
04714cd0de make singleton Environment accessible outside of Dagger graph 2022-08-11 17:35:35 +02:00
Sebastian Stenzel
46dbe15e4a update dependencies 2022-08-11 17:34:34 +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
f84eef5639 actually use the scene in ui flow 2022-08-08 16:37:30 +02:00
Armin Schrenk
281f6f727f show info for 402 response on unlock 2022-08-08 16:33:07 +02:00
Armin Schrenk
47f2d423b9 Remove code smells 2022-07-28 11:16:59 +02:00
Armin Schrenk
80b5b6af00 simplify app version code 2022-07-28 10:58:50 +02:00
Armin Schrenk
414c4e20b8 remove code smell 2022-07-28 10:47:46 +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
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