mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-04-22 02:26:55 -04:00
Code Issues Packages Projects Releases Wiki Activity
3,419 Commits 29 Branches 213 Tags
3ff3b1c63e69c5ecc7752f60ce9a2f94de7ebb6b
Commit Graph

3419 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastian Stenzel
6b113f26ba reduce Platform.runLater() invokations 2021-06-29 16:26:16 +02:00
Sebastian Stenzel
dbef1466c1 read vault config async 2021-06-29 16:07:46 +02:00
Sebastian Stenzel
6b0d8a48c2 added temporary dummy health checks for testing purposes 
[ci skip]
 2021-06-29 14:05:01 +02:00
Sebastian Stenzel
c7b9735f13 simplify task selection code 2021-06-29 14:04:32 +02:00
Armin Schrenk
a96115ecd6 Feature: revamp health workflow init (#1695) 
* Add health tab to vault options:
* health tool is started from there
* health tool closes old Window and creates new one
* added info and remarks about health tool
* adds confirmation checkbox before starting health tool
* close vault options window when starting health workflow
* Remove AutoLock tab, move options to general tab

Co-authored-by: Snyk bot <snyk-bot@snyk.io>
Co-authored-by: Tobias Hagemann <tobias.hagemann@skymatic.de>
Co-authored-by: Sebastian Stenzel <sebastian.stenzel@skymatic.de >
 2021-06-29 09:57:45 +02:00
Sebastian Stenzel
c6aceb3e59 don't setPassphraseStored to true after changing pw, when it isn't actually stored 2021-06-28 18:52:34 +02:00
Sebastian Stenzel
cadd071ebd update cryptofs 2021-06-28 18:42:10 +02:00
Sebastian Stenzel
b64264ef8b updated 3rd party licenses 
[ci skip]
 2021-06-26 17:49:18 +02:00
Sebastian Stenzel
429ca6cfd0 Merge branch 'develop' into feature/modular 
# Conflicts:
#	pom.xml
#	src/main/resources/license/THIRD-PARTY.txt
 2021-06-26 17:48:13 +02:00
Sebastian Stenzel
46691f057e dependency update 2021-06-26 17:42:40 +02:00
Sebastian Stenzel
f1b40e32a7 dependency update 2021-06-26 17:25:00 +02:00
Snyk bot
b4a97803ff [Snyk] Security upgrade org.cryptomator:webdav-nio-adapter from 1.2.2 to 1.2.3 (#1698) 
* fix: pom.xml to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JAVA-ORGECLIPSEJETTY-1313686

* adjusted suppression config

* bump webdav version

Co-authored-by: Sebastian Stenzel <sebastian.stenzel@gmail.com>
 2021-06-24 09:58:47 +02:00
JaniruTEC
8ac253504f Merge pull request #1697 from cryptomator/refactoring/spellchecking 
Enabled spellchecking, added dictionaries, fixed spelling mistakes
 2021-06-23 22:49:57 +02:00
JaniruTEC
135b61070d Fixed misspelled key 2021-06-23 22:48:18 +02:00
Armin Schrenk
903f55a24f improve health check gui: 
* convert milliseconds to hours, minutes and seconds
* spelling
* adjust to dark theme
 2021-06-22 17:17:28 +02:00
Sebastian Stenzel
94e26da693 Re-enable FUSE 
This reverts commit 0e924e7429.
 2021-06-22 17:16:36 +02:00
Sebastian Stenzel
458a466c7f updated and excluded dependencies 2021-06-18 15:17:38 +02:00
Sebastian Stenzel
4f3cd2f47c replace JSR-305 Nullable annotation 2021-06-18 15:16:57 +02:00
Julian Raufelder
f2fadafa66 Fix snyk.io badge in README due to switch to single maven module 2021-06-16 16:11:31 +02:00
Julian Raufelder
0676732796 Merge pull request #1693 from cryptomator/feature/sign-src-tarball 
Sign tarball in release using GPG
 2021-06-16 12:54:37 +00:00
Julian Raufelder
08cbfd47ea Prefix signature of tarball in release with cryptomator 
To apply convention of the other release assets
 2021-06-16 14:20:52 +02:00
Julian Raufelder
b15cda260e Apply suggestions from code review 
Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
 2021-06-16 12:13:49 +00:00
Julian Raufelder
74355b128a Sign tarball in release using GPG 2021-06-16 13:49:26 +02:00
JaniruTEC
000f27e166 Fixed spelling mistakes that required API breaking changes 2021-06-12 01:56:15 +02:00
JaniruTEC
e1d83c996e Fixed independent spelling mistakes 
Added @SuppressWarnings("SpellCheckingInspection") to binary data (e.g. keys) or deliberately misspelled strings
 2021-06-12 01:45:31 +02:00
JaniruTEC
0dc401883f Enabled proofreading 
Removed dict_* files from .gitignore
Added dict_de.xml
Added dict_project.xml
 2021-06-12 01:35:36 +02:00
JaniruTEC
364d59fdf7 Added ".idea/**/shelf" to .gitignore 
See: 991e760c1c/Global/JetBrains.gitignore (L9)
 2021-06-11 18:28:25 +02:00
Sebastian Stenzel
be6b6e4541 adjusted launcher scripts to use the module path 2021-06-10 10:35:02 +02:00
Sebastian Stenzel
6f3c90465c adjust fxml loading to modular setup 2021-06-09 21:25:00 +02:00
Sebastian Stenzel
0e924e7429 disable fuse for now 2021-06-09 21:23:40 +02:00
Sebastian Stenzel
52940d6a19 add module-info 
[ci skip] due to split package in jnr-fuse
 2021-06-09 18:37:58 +02:00
Sebastian Stenzel
7f4a9c13dc update easybind 2021-06-09 18:33:08 +02:00
Sebastian Stenzel
210050d9d5 update cryptofs 2021-06-09 18:15:39 +02:00
Sebastian Stenzel
f10d2b713b made tests public to avoid reflection and "open modules" 
see also https://issues.apache.org/jira/browse/SUREFIRE-1909
 2021-06-09 10:14:08 +02:00
JaniruTEC
f9545b5532 Refactored MPC priority 2021-06-09 01:16:51 +02:00
Sebastian Stenzel
58376bddef Merge pull request #1685 from cryptomator/feature/provider-agnostic-keychains 
Remove all references to specific keychain access providers
 2021-06-08 14:42:56 +02:00
Sebastian Stenzel
72e2f64a68 show provided display name 2021-06-07 16:24:42 +02:00
Sebastian Stenzel
48ad74715e * store class name of selected keychain in settings.json 
* prepared GeneralPreferencesController to use a provider-supplied display name
 2021-06-07 15:17:58 +02:00
Ralph Plawetzki
2e1f33ca82 Fix instructions for building (#1682) 2021-06-06 21:56:28 +02:00
Cryptobot
2d3f4d1c03 New Crowdin updates (#1678) 
[ci skip]

Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
 2021-06-05 09:11:48 +02:00
Sebastian Stenzel
04c13ba242 New Crowdin updates (#1677) 
[ci skip]

Co-authored-by: Cryptobot <cryptobot@users.noreply.github.com>
 2021-06-04 21:00:56 +02:00
Cryptobot
b70033e777 Update Crowdin configuration file 2021-06-04 20:48:48 +02:00
Sebastian Stenzel
fafb7b229f update i18n config 
[ci skip]
 2021-06-04 20:29:15 +02:00
Sebastian Stenzel
fef5be95ec Merge branch 'develop' into release/1.6.0 
# Conflicts:
#	main/buildkit/pom.xml
#	main/commons/pom.xml
#	main/launcher/pom.xml
#	main/pom.xml
#	main/ui/pom.xml
 2021-06-04 20:24:33 +02:00
Sebastian Stenzel
7fac6da448 Single maven module (#1676) 
combined all sources into single maven module
 2021-06-04 20:09:10 +02:00
Sebastian Stenzel
72bd9c1fdf New Crowdin updates (#1643) 
[ci skip]
 2021-06-04 15:44:48 +02:00
Sebastian Stenzel
39b8e25f4f Merge pull request #1596 from eas5/test_improvement 
Improved grouped assertions
 2021-06-04 15:42:16 +02:00
Sebastian Stenzel
c8fa7f1edd fix NPE in autolocker, when reading "lastActivity" before any activity happened 2021-06-04 09:40:23 +02:00
Sebastian Stenzel
95b98b8a36 Merge pull request #1603 from cryptomator/feature/autoLock 
fixes #274
 2021-06-02 16:24:26 +02:00
Sebastian Stenzel
005d2a82fe use stopwatch item for autolock tab 2021-06-02 16:22:19 +02:00