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

1477 Commits

Author SHA1 Message Date
Sebastian Stenzel
1eeee61572 Add option to show minimize button despite tray icon being present 
fixes #1179
 2020-12-17 14:50:33 +01:00
Sebastian Stenzel
984b7a2d0e Removed @Named("trayMenuSupported") from FxApplication component 2020-12-17 14:46:52 +01:00
Sebastian Stenzel
45c714a123 Added checkbox in settings to start without a tray icon 
references #1113, #1078, #1079, #1344
 2020-12-16 16:53:49 +01:00
Sebastian Stenzel
f441700c25 Merge branch 'master' into develop 2020-12-15 13:23:21 +01:00
Tobias Hagemann
e949023321 updated third-party list [ci skip] 2020-12-15 10:37:27 +01:00
Sebastian Stenzel
da31407d63 Preparing 1.5.11 2020-12-15 08:57:35 +01:00
Sebastian Stenzel
8c7c5da89a not sure what makes this "real" [ci skip] 2020-12-15 08:04:16 +01:00
Sebastian Stenzel
e3a0e1ec5a New Crowdin updates (#1413) 
[ci skip]
 2020-12-14 17:38:49 +01:00
Armin Schrenk
bf47ba0145 Merge pull request #1440 from cryptomator/feature/#1439-finish-migration 
closes #1439
 2020-12-14 15:41:52 +01:00
Armin Schrenk
fc7b484c9a unwrap the Platform.runLater() statement because it is always executed on JavaFX thread 2020-12-14 15:34:03 +01:00
Armin Schrenk
4402c19d90 Simplifications and clean up 2020-12-14 11:47:02 +01:00
Armin Schrenk
6fac84e9c2 Replace "may" by "can" 
... the end of a great and fierce war.
 2020-12-09 15:39:49 +01:00
Sebastian Stenzel
77b2e67c49 updated labels 2020-12-09 15:16:45 +01:00
Armin Schrenk
6da7eae2f8 Minor changes in lettering 2020-12-09 14:55:22 +01:00
Armin Schrenk
aec56c48c5 Merge branch 'develop' into feature/#1228-forcedUnmountDialog 
# Conflicts:
#	main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java
 2020-12-09 14:51:00 +01:00
Sebastian Stenzel
3b73544766 Simplified observation of visible stages 2020-12-08 12:56:44 +01:00
Sebastian Stenzel
1cd4da0796 Merge branch 'develop' into feature/#1228-forcedUnmountDialog 2020-12-07 17:55:29 +01:00
Tobias Hagemann
ab3dd779d2 partially reverted 900fdd7f, fixing "stutter" startup on macos 2020-12-02 14:59:17 +01:00
Armin Schrenk
1fbcf6d517 closes #1439 2020-11-27 15:53:33 +01:00
Armin Schrenk
82538091c9 Merge pull request #1427 from cryptomator/feature/#1323-singleQuitWindow 
Show only one quit dialogue at a time
 2020-11-24 15:31:31 +01:00
Sebastian Stenzel
62ade6113b cleanup 
[ci skip]
 2020-11-24 15:07:23 +01:00
Sebastian Stenzel
4779bbf415 Don't bother FxApplication with stuff that is meant to be dealt with internally within QuitComponent 2020-11-24 15:04:09 +01:00
Armin Schrenk
c6b786a771 Reworked implemenation by using dagger now: 
* create and inject QuitResponse container
* QuitComponent manges now if quit window needs to be created
* controller only handles the most recent QuitResponse
 2020-11-24 13:34:12 +01:00
Armin Schrenk
6381227897 Stylin: 
* change css styleclass of dialogue headings to `label-large`
* remove newly introduced style class `label-medium`
 2020-11-23 16:14:31 +01:00
Armin Schrenk
e82167b5e6 correct wrong method name 2020-11-20 17:29:56 +01:00
Armin Schrenk
dc4fd482b5 Filter any whitespaces when entering text in donationkey form. 2020-11-20 17:17:16 +01:00
Armin Schrenk
a71f8b350e Show only one quit dialogue at a time 2020-11-20 16:12:49 +01:00
Armin Schrenk
c9ec8fecef fix wrong method name 2020-11-20 16:09:31 +01:00
Armin Schrenk
e72d32f2d1 Remove empty line 
Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
 2020-11-20 14:34:34 +01:00
Armin Schrenk
2545aa2a7e Removed default clause from switch expression on enums 
Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
 2020-11-20 14:33:57 +01:00
Armin Schrenk
51aac15622 Changed forced lock description and clean up 2020-11-20 12:23:44 +01:00
Armin Schrenk
afa0cfeafb Replace lock failed dialogue stub and integrate it into workflow 2020-11-20 12:23:18 +01:00
Armin Schrenk
19e24ba12c refactor structure of LockWorkflow class 2020-11-20 12:22:26 +01:00
Armin Schrenk
c47ce2c730 clean up 2020-11-20 11:25:39 +01:00
Armin Schrenk
4db57cc0dc Further improvements: 
* adding Log messages
* change lock workflow to type of Task<Void>
* set vault state based solely on task state
* replaced dialogue stubs with real text
 2020-11-19 16:31:16 +01:00
Armin Schrenk
432a9a27f1 Add forceLock Dialogue: 
* integrate it in workflow if normal lock throws exception
* add stubs if also forced lock fails
 2020-11-19 12:52:16 +01:00
Armin Schrenk
57bfa3276d Integrate new lockWorkflow into application (gui and tray) 2020-11-19 11:42:00 +01:00
Armin Schrenk
c44911dcac Prepare strucutre and classes for lock workflow 2020-11-18 17:16:58 +01:00
Armin Schrenk
bcf2a3d20c Setting default onFailed handler in lock tasks 2020-11-18 17:16:43 +01:00
Sebastian Stenzel
a074450452 Merge branch 'master' into develop 2020-11-18 15:03:37 +01:00
Sebastian Stenzel
9b653f488b Merge branch 'develop' into hotfix/1.5.10 2020-11-18 15:02:33 +01:00
Sebastian Stenzel
490d1b8f87 cancel unlock workflow, if closing window with shortcut 2020-11-18 14:21:18 +01:00
Sebastian Stenzel
df2b4ac086 cleanup 2020-11-18 13:17:35 +01:00
Sebastian Stenzel
aee4ececba Merge branch 'fix/1409' into hotfix/1.5.10 
fixes #1409
 2020-11-18 13:16:36 +01:00
Sebastian Stenzel
4c546d281a Bumped version 2020-11-18 13:15:33 +01:00
Sebastian Stenzel
d3c2b0509e Lazily call IrregularUnmountCleaner from (and only from!) TemporaryMountPointChooser 2020-11-18 13:08:48 +01:00
Sebastian Stenzel
cbbfec5531 Merge branch 'develop' into release/1.5.9 2020-11-16 17:16:54 +01:00
Sebastian Stenzel
d7a4dff080 New Crowdin updates (#1401) 
New translations strings.properties
[ci skip]
 2020-11-16 17:15:37 +01:00
Sebastian Stenzel
c865805f55 Preparing 1.5.9 2020-11-10 12:41:10 +01:00
Sebastian Stenzel
8e352301cd New Crowdin updates (#1392) 
[ci skip]
 2020-11-10 12:39:15 +01:00