Magic-Mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2024-11-23 12:09:45 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
5,163 Commits 24 Branches 187 Tags 36 MiB
4f3ca2a6c4
Commit Graph

5163 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Armin Schrenk
4f3ca2a6c4
fix appimage build script [ci skip] 2024-02-09 12:56:33 +01:00
Armin Schrenk
27cd34bee0
Merge branch 'main' into develop [ci skip] 2024-02-09 12:53:16 +01:00
Armin Schrenk
c07e51be51
Merge branch 'release/1.12.2' 2024-02-09 12:51:57 +01:00
Armin Schrenk
0421879b39
finalize 1.12.2 2024-02-09 12:51:19 +01:00
Armin Schrenk
2d627717a0
prepare 1.12.2 2024-02-09 10:59:33 +01:00
Armin Schrenk
dc0e88a694
fixes #3319 2024-02-09 10:55:27 +01:00
Armin Schrenk
a5e3630375
also specify version for winget release [ci skip] 2024-02-08 17:47:50 +01:00
Armin Schrenk
17335e8f70
shorten workflow name [ci skip] 2024-02-08 17:39:38 +01:00
Armin Schrenk
42dd2fba48
github cli needs special token in CI env [ci skip] 2024-02-08 17:37:50 +01:00
Armin Schrenk
e1cca6427c
Add ci job for releasing to winget 2024-02-08 17:34:02 +01:00
Armin Schrenk
42d3dbaa23
always use latest version of winfsp-uninstaller 2024-02-08 17:10:40 +01:00
Armin Schrenk
185d67c492
Merge branch 'main' into develop [ci skip] 2024-02-07 11:43:59 +01:00
Armin Schrenk
a8af3c8b40
Merge branch 'release/1.12.1' 2024-02-07 11:42:58 +01:00
Armin Schrenk
038a7fac62
finalize 1.12.1 2024-02-07 11:42:37 +01:00
Armin Schrenk
48408fa40d
prepare 1.12.1 2024-02-07 11:37:44 +01:00
Armin Schrenk
18a417667e
Fixes #3315 2024-02-07 11:33:45 +01:00
JaniruTEC
aab07b13e3 Changed version specifier for dependency-check 
See: https://github.com/cryptomator/cryptofs/pull/202#discussion_r1453615249
 2024-02-06 22:28:16 +01:00
Armin Schrenk
869e40e351
use latest coffeelibs-jdk release 2024-02-06 15:34:09 +01:00
Armin Schrenk
bf91e3f15c
Merge branch 'main' into develop [ci skip] 2024-02-06 14:29:19 +01:00
Armin Schrenk
17544828e4
Merge branch 'release/1.12.0' 2024-02-06 14:28:08 +01:00
Armin Schrenk
cfef3139b1
finalize 1.12.0 2024-02-06 14:20:50 +01:00
Armin Schrenk
b01ba27b06
Partially reverting 24293b316f 2024-02-06 14:16:03 +01:00
Armin Schrenk
5a33e66a7d
prepare 1.12.0 2024-02-06 11:31:42 +01:00
Armin Schrenk
3c4e35406e
Bump dependencies 2024-02-06 11:27:02 +01:00
Cryptobot
d3275fa4e7
New Crowdin updates (#3256) 
New translations strings.properties

Arabic; Bashkir; Belarusian; Bulgarian; Catalan; Chinese Simplified; Chinese Traditional; Chinese Traditional, Hong Kong; Czech; Danish; Dutch; Filipino; French; German; Greek; Hebrew; Hungarian; Italian; Japanese; Korean; Latvian; Norwegian Bokmal; Polish; Portuguese; Portuguese, Brazilian; Punjabi; Romanian; Russian; Slovak; Spanish; Swahili, Tanzania; Swedish; Turkish; Vietnamese;

[ci skip]
 2024-02-06 11:21:07 +01:00
dependabot[bot]
a30db34c19
Bump the java-production-dependencies group with 6 updates (#3295) 2024-02-06 10:18:33 +00:00
dependabot[bot]
509100e7ae
Bump the java-test-dependencies group with 2 updates (#3312) 2024-02-06 10:17:11 +00:00
dependabot[bot]
024c34172b
Bump the github-actions group with 5 updates (#3308) 2024-02-06 10:16:24 +00:00
dependabot[bot]
638570562b
Bump the maven-build-plugins group with 3 updates (#3300) 2024-02-06 10:15:06 +00:00
Sebastian Stenzel
ee5a5c6563
Merge pull request #3291 from cryptomator/feature/legacy-device-migration 
Hub 1.2.x → Hub 1.3.x Legacy Device Migration
 2024-02-02 14:59:30 +01:00
Armin Schrenk
85c52c60c5
Revert "update javafx to 21.0.2" 
This reverts commit 93184abd3c.
 2024-02-02 10:45:34 +01:00
Armin Schrenk
93184abd3c
update javafx to 21.0.2 2024-01-30 12:55:33 +01:00
Armin Schrenk
8062392ccd
update jdk to 21.0.2+13 2024-01-30 12:17:45 +01:00
Jan-Peter Klein
d49c02c7de
optimize share vault fxml 2024-01-29 17:37:55 +01:00
Sebastian Stenzel
d66cfe0e7c
adjust to new migration API 2024-01-26 16:48:08 +01:00
mindmonk
fa26fa9dee
Merge pull request #3289 from cryptomator/feature/share-vault 
Feature: Introduce 'Share Vault' Functionality
 2024-01-26 16:08:06 +01:00
Jan-Peter Klein
52fc94ca01
fixed a spelling error 2024-01-26 16:03:51 +01:00
Jan-Peter Klein
e9a412ae16
improved layout and added styleClass for add-box 2024-01-26 15:42:25 +01:00
Jan-Peter Klein
8104c35d76
more specific translation keys and consistent spacing 2024-01-23 19:09:49 +01:00
Jan-Peter Klein
baa2e05e69
improved wording and layout 2024-01-23 14:00:20 +01:00
Armin Schrenk
f50b204cef
Merge pull request #3288 from cryptomator/feature/3246-split-device-registration 
Feature: Split device registration into "normal" and "legacy" flow
 2024-01-22 14:56:45 +01:00
lectrical
ed902bc59f Hello 2024 2024-01-20 16:22:27 +01:00
Sebastian Stenzel
693299a5d7
first draft of legacy device migration 
actual migration still missing due to API discussion
 2024-01-20 13:28:56 +01:00
Sebastian Stenzel
def64aa2ac
added tests 2024-01-20 13:25:57 +01:00
Sebastian Stenzel
c5bb8a131d
dedup 2024-01-20 13:15:33 +01:00
Sebastian Stenzel
2e443c72a9
add new API encryptVaultKey(vaultKey, userKey) 
and `decodeECPublicKey(byte[])`
 2024-01-20 13:12:59 +01:00
Sebastian Stenzel
e9ee17493b
refactor API, expose decodeECPrivateKey(byte[]) 2024-01-20 13:01:48 +01:00
Sebastian Stenzel
35eb548d8e
replaced Guava's BaseEncoding with Base64 2024-01-20 12:58:44 +01:00
Sebastian Stenzel
dc5d6e734e
deduplicate code 2024-01-19 17:55:36 +01:00
Sebastian Stenzel
729f38866f
use string templates for URI construction 2024-01-19 17:40:39 +01:00