mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-17 10:11:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,657 Commits 36 Branches 214 Tags
c04597eca5a09d4dcd510adcdf314560981d359a
Commit Graph

3657 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastian Stenzel
c04597eca5 Merge branch 'main' into develop 
[ci skip]
 2022-04-27 15:52:15 +02:00
Sebastian Stenzel
ba1945ebb8 Merge branch 'release/1.6.9' 1.6.9 2022-04-27 15:51:50 +02:00
Sebastian Stenzel
e9551a076d Merge branch 'develop' into release/1.6.9 2022-04-27 15:30:59 +02:00
Sebastian Stenzel
ccd3da3b09 Merge pull request #2096 from cryptomator/feature/integrations-api-1.1.0 
Integrations API 1.1.0
 2022-04-27 15:29:47 +02:00
Sebastian Stenzel
5e06fa7385 Merge branch 'develop' into feature/integrations-api-1.1.0 
# Conflicts:
#	pom.xml
 2022-04-27 15:23:38 +02:00
Sebastian Stenzel
c3969f2f33 bumped integrations version 2022-04-27 15:19:54 +02:00
Sebastian Stenzel
0a8cc7ed1e Merge branch 'develop' into release/1.6.9 2022-04-27 13:19:41 +02:00
Cryptobot
74f5be1605 New Crowdin updates (#2146) 
[ci skip]
 2022-04-27 13:19:03 +02:00
Sebastian Stenzel
3c376c4bf6 add -Dsun.java2d.metal=true, which fixes #2194 2022-04-27 13:18:25 +02:00
Armin Schrenk
fedb62d99a Merge pull request #2175 from cryptomator/feature/binary-stylesheets 
Prefer binary stylesheets
 2022-04-27 13:06:18 +02:00
Armin Schrenk
8f97235b9a Merge pull request #2189 from cryptomator/feature/on-the-fly-license 
Generate app license on release/ installer build and remove commited third party file
 2022-04-27 13:05:53 +02:00
Julian Raufelder
d127121007 Update metainfo.xml to 1.6.9 
[ci skip]
 2022-04-26 19:51:43 +02:00
Armin Schrenk
d6a55d3006 preparing 1.6.9 2022-04-26 18:14:40 +02:00
Armin Schrenk
d3d0cef2bb bumping dependencies 2022-04-26 18:07:37 +02:00
Armin Schrenk
c514dc6235 fixes #2205 2022-04-26 17:58:37 +02:00
Armin Schrenk
98b3b14e6a Reverted bundle license to show links again and adjusted license template 
* only those are depicted as clickable http links
 2022-04-26 17:48:05 +02:00
Armin Schrenk
835a5592fc use pwsh for license generation to circumvent slash problem in url 2022-04-22 17:18:28 +02:00
Armin Schrenk
c429de6a66 third slash's the charm 2022-04-22 16:52:49 +02:00
Armin Schrenk
afe7737129 wrong usage of github workspace var 2022-04-22 16:25:00 +02:00
Armin Schrenk
94b3ea37d6 use absolute path in workflow 2022-04-22 16:19:09 +02:00
Tobias Hagemann
4d7e16d58e updated license templates 2022-04-22 12:34:25 +02:00
Armin Schrenk
2f17d80fe6 Revert "removed license dir, renamed merge file and adjusted paths" 
This reverts commit d053367f83.
 2022-04-22 11:51:22 +02:00
Armin Schrenk
fbc598fed7 Reordered steps in vault creation and renamed methods 2022-04-22 10:40:18 +02:00
Armin Schrenk
d053367f83 removed license dir, renamed merge file and adjusted paths 2022-04-22 09:49:04 +02:00
Armin Schrenk
9f5c31e4e7 Move app specific license template to resources directory 2022-04-21 14:21:40 +02:00
Armin Schrenk
68d4b440e1 use spaces instead of tabs in app license file 2022-04-20 17:47:50 +02:00
Armin Schrenk
bcfba21900 Create third-party-license file in target directory, use plugin defaults to let it placed inside jar 2022-04-20 17:46:58 +02:00
Armin Schrenk
c1801e3d22 fixed typo 2022-04-20 12:12:25 +02:00
Armin Schrenk
bff0194f3e Fixed wrong file format and url of lcense merge file 2022-04-20 12:12:00 +02:00
Armin Schrenk
75f96eb08f removing static third-party-licenses file 2022-04-20 10:37:13 +02:00
Armin Schrenk
4d1d6f449e Apply suggestions from code review 
Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
 2022-04-20 10:31:25 +02:00
Armin Schrenk
eb0a2c1267 On macOS show example in dark mode when adding existing vault 2022-04-19 17:34:12 +02:00
Armin Schrenk
51d715caa1 apply same config to license generation 2022-04-19 16:47:33 +02:00
Sebastian Stenzel
b55bd8075c relax stale bot 
[ci skip]
 2022-04-18 09:18:51 +02:00
Sebastian Stenzel
d368b01038 Merge pull request #2105 from cryptomator/feature/gtk2-launcher 
Add additional GTK2 launcher to AppImage, fixes #1432
 2022-04-18 08:24:13 +02:00
Tobias Hagemann
dc3894290b updated license template for macos, fixed manual build script 2022-04-14 13:52:10 +02:00
Armin Schrenk
597bbdbdb8 for mac build generate license on the fly 
References 7172462b4b
 2022-04-13 17:53:44 +02:00
Sebastian Stenzel
2b255ed101 Merge branch 'develop' into feature/integrations-api-1.1.0 
# Conflicts:
#	src/main/java/org/cryptomator/ui/fxapp/FxApplication.java
#	src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
 2022-04-13 07:21:59 +02:00
Sebastian Stenzel
9ece1f66a1 bumped API to 1.1.0-rc1 2022-04-13 07:16:19 +02:00
JaniruTEC
e71b375437 Added "--version" (short: "-v") 
Merge pull request #2064 from cryptomator/1996-cli-version
 2022-04-13 00:57:08 +02:00
JaniruTEC
bcb2b088ba Applied suggestions from code review 2022-04-13 00:46:11 +02:00
JaniruTEC
f123dff0cd Merge remote-tracking branch 'origin/develop' into 1996-cli-version 
# Conflicts:
#	src/main/java/org/cryptomator/launcher/Cryptomator.java
 2022-04-12 17:44:13 +02:00
Sebastian Stenzel
0ace5bb42b fix copy-paste error in log message 2022-04-11 12:34:50 +02:00
Sebastian Stenzel
b656b591ed prefer .bss over .css 2022-04-11 12:32:07 +02:00
Sebastian Stenzel
564370ec7a compile .css into .bss file 2022-04-11 12:31:57 +02:00
Tobias Hagemann
7dd0f0cb31 Merge pull request #2173 from cryptomator/feature/preferences-interface 
Moved interface preferences to its own tab
 2022-04-11 10:49:14 +02:00
Tobias Hagemann
79e1285b38 increased margins and spacings even further 2022-04-11 10:48:47 +02:00
Sebastian Stenzel
9c26d17733 log durations of application start 2022-04-11 09:36:34 +02:00
Sebastian Stenzel
69f3a2bd5a log errors when showing main window 2022-04-11 09:35:35 +02:00
Sebastian Stenzel
9a9ef6c583 updated license file 
[ci skip]
 2022-04-11 09:23:53 +02:00