mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-20 11:41:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,766 Commits 36 Branches 214 Tags
9be00a2693776bf4ccfff148e4e4f660a7da618e
Commit Graph

4766 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Armin Schrenk
8009205da7 Merge branch 'main' into develop 
# Conflicts:
#	pom.xml
 2022-12-14 20:07:24 +01:00
Armin Schrenk
c0f73a2802 Merge branch 'hotfix/1.6.17' 1.6.17 2022-12-14 20:06:35 +01:00
Armin Schrenk
8e902877a3 Update dependency-check plugin and exclude false positive 
(cherry picked from commit ebcd0adf78)
 2022-12-14 20:06:23 +01:00
Armin Schrenk
fd76c89393 update metainfo 2022-12-14 20:02:12 +01:00
Armin Schrenk
975baf594c Fixes #2576 2022-12-14 19:58:22 +01:00
Vsevolod Golovanov
5a99c7bb61 Unlocked status indicator in tray icon #2557 
Now tracking unlockedness and updating the icon accordingly.
 2022-12-14 21:18:37 +04:00
Tobias Hagemann
e2898f0c8b GCM is ready! 2022-12-14 17:36:06 +01:00
Tobias Hagemann
cf2b236df5 added tray icons for unlocked state 2022-12-14 17:28:59 +01:00
Tobias Hagemann
819fa803f3 cleaned up tray icons 2022-12-14 16:47:07 +01:00
Armin Schrenk
980e2b184b use correct tag name for gh release in debian workflow 2022-12-13 12:48:29 +01:00
Sebastian Stenzel
ebad677e84 fix path to downloaded jmod files 2022-12-12 09:14:24 +01:00
Sebastian Stenzel
4fda4a2b2e fix makefile 2022-12-12 09:09:25 +01:00
Sebastian Stenzel
ffaf7ad360 adjust package dependencies to new mount api and jfuse 2022-12-12 09:03:56 +01:00
Sebastian Stenzel
76689705f5 remove LD_PRELOAD workaround, which should no longer be required with jfuse 2022-12-12 08:54:18 +01:00
Armin Schrenk
1a358f06e8 revert 0725a63b09 and fix workflow 
(cherry picked from commit 9dfd8adcce)
1.7.0-alpha2 		2022-12-09 17:01:42 +01:00
Armin Schrenk
db4d845a5b adjust matching rules for version type detection 
(cherry picked from commit cd358916260e713d4119c20b1bcb5b448a017365)
(cherry picked from commit 433eecc6a8)
 2022-12-09 17:01:33 +01:00
Armin Schrenk
0d6d7b0dd6 directly use inputs object 2022-12-09 16:56:45 +01:00
Armin Schrenk
9dfd8adcce revert 0725a63b09 and fix workflow 2022-12-09 16:56:02 +01:00
Armin Schrenk
433eecc6a8 adjust matching rules for version type detection 
(cherry picked from commit cd358916260e713d4119c20b1bcb5b448a017365)
 2022-12-09 16:50:39 +01:00
Armin Schrenk
36ed4554b2 Fixes #2570 
Dabian build: Make libffi7 a runtime dependency and preload it.
 2022-12-09 15:12:04 +01:00
Armin Schrenk
c2dac30f2d Merge branch 'develop' into release/1.7.0 2022-12-08 17:50:55 +01:00
Armin Schrenk
63a89b5bcf adjust post-release and win-exe workflow 2022-12-08 17:50:31 +01:00
Armin Schrenk
12b53acd22 Merge branch 'develop' into release/1.7.0 2022-12-08 17:37:29 +01:00
Armin Schrenk
9105d1af16 Merge branch 'feature/mount-provider' into release/1.7.0 
# Conflicts:
#	dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml
 2022-12-08 17:02:44 +01:00
Armin Schrenk
de46b91420 use directly inputs object 2022-12-08 13:59:55 +01:00
Armin Schrenk
67b40649bc fix version number in debian workflow 2022-12-08 13:56:42 +01:00
Armin Schrenk
c41af77108 remove unused translation keys 2022-12-08 10:50:04 +01:00
Armin Schrenk
ba66d4bfce bump fuse-nio-adapter 2022-12-07 17:39:27 +01:00
Armin Schrenk
c45a00377d Merge branch 'develop' into feature/mount-provider 
# Conflicts:
#	.github/workflows/appimage.yml
#	.github/workflows/mac-dmg.yml
#	.github/workflows/win-exe.yml
#	pom.xml
#	src/main/java/org/cryptomator/common/vaults/WebDavVolume.java
#	src/main/java/org/cryptomator/ui/traymenu/AwtTrayMenuController.java
 2022-12-07 17:01:56 +01:00
Armin Schrenk
f9d588320c add slack notification to release PPA 2022-12-07 14:53:41 +01:00
Armin Schrenk
c61087e697 create and upload source signature after release publish 2022-12-07 14:52:33 +01:00
Armin Schrenk
0725a63b09 release winget manually 2022-12-07 14:29:00 +01:00
Armin Schrenk
ebcd0adf78 Update dependency-check plugin and exclude false positive 2022-12-07 14:17:42 +01:00
Armin Schrenk
0e7ec8eb37 bump replace deprecated syntax and dependencies in win-exe build 2022-12-07 12:24:42 +01:00
Armin Schrenk
0e9b115647 debian build: use correct package names 2022-12-07 11:43:59 +01:00
Armin Schrenk
5ba137dda5 Add additional build dependencies to debian build 2022-12-07 11:11:31 +01:00
Sebastian Stenzel
db928ba034 try fixing debian build 2022-12-06 20:49:09 +01:00
Sebastian Stenzel
2cc01be236 simplify jmod compatibility check 2022-12-06 20:44:51 +01:00
Sebastian Stenzel
ba2a4955d0 fix expected orig.tar.gz name 2022-12-06 20:27:19 +01:00
Sebastian Stenzel
d1971e3c2a yml validation error 2022-12-06 20:18:55 +01:00
Sebastian Stenzel
5665984a9b trigger Debian build and provide version info by hand 2022-12-06 20:13:34 +01:00
Armin Schrenk
1f2225991a Merge branch 'main' into develop 2022-12-06 15:46:19 +01:00
Armin Schrenk
1f0fe161fd Merge branch 'release/1.6.16' 1.6.16 2022-12-06 15:45:34 +01:00
Armin Schrenk
4ff8bbaa62 Merge branch 'develop' into release/1.6.16 2022-12-06 15:44:18 +01:00
Armin Schrenk
e188169916 add missing javafx getter in resultListCell 2022-12-06 15:44:02 +01:00
Armin Schrenk
1b9480293a Bump cryptofs 2022-12-06 15:43:25 +01:00
Armin Schrenk
d8b71db8e5 bump metainfo.xml 2022-12-06 15:27:17 +01:00
Armin Schrenk
4bd99d2b66 preparing 1.6.16 2022-12-06 15:24:52 +01:00
Cryptobot
61027852e1 New Crowdin updates (#2474) 
New translations strings.properties

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

[ci skip]
 2022-12-06 15:20:47 +01:00
Armin Schrenk
512500aaef bump cryptofs version 2022-12-06 11:03:29 +01:00