From e8d17cfb7b41e3eb8fa3e5083d702d8f01f48087 Mon Sep 17 00:00:00 2001 From: ainiml Date: Sun, 6 Sep 2020 19:25:50 -0400 Subject: [PATCH 1/6] allows running launcher-linux.sh from any path --- main/buildkit/src/main/resources/launcher-linux.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/main/buildkit/src/main/resources/launcher-linux.sh b/main/buildkit/src/main/resources/launcher-linux.sh index 2322870e8..b64d2c1ce 100644 --- a/main/buildkit/src/main/resources/launcher-linux.sh +++ b/main/buildkit/src/main/resources/launcher-linux.sh @@ -1,4 +1,5 @@ #!/bin/sh +cd $(dirname $0) java \ -cp "libs/*" \ -Dcryptomator.settingsPath="~/.config/Cryptomator/settings.json" \ From 29a9c7dffe8a15ae5f2c0cc4bd8ef7e7c6901667 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Sun, 13 Sep 2020 11:50:26 +0200 Subject: [PATCH 2/6] auto-close bugs violating the issue template [ci skip] --- .github/ISSUE_TEMPLATE/bug.md | 3 +++ .github/workflows/triageBugs.yml | 25 +++++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 .github/workflows/triageBugs.yml diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md index dfabee3e5..4775a0aa2 100644 --- a/.github/ISSUE_TEMPLATE/bug.md +++ b/.github/ISSUE_TEMPLATE/bug.md @@ -5,6 +5,7 @@ labels: type:bug --- + ### Description diff --git a/.github/workflows/triageBugs.yml b/.github/workflows/triageBugs.yml new file mode 100644 index 000000000..f3354fb11 --- /dev/null +++ b/.github/workflows/triageBugs.yml @@ -0,0 +1,25 @@ +name: Bug Report Triage + +on: + issues: + types: [opened] + +jobs: + closeTemplateViolation: + name: Close bug reports that violate the issue template + runs-on: ubuntu-latest + steps: + - if: | + contains(github.event.issue.labels.*.name, 'type:bug') + && ( + !contains(github.event.issue.body, '') + || !contains(github.event.issue.body, '### Description') + ) + name: Close Issue + uses: peter-evans/close-issue@v1 + with: + comment: | + This bug report did ignore our issue template. 😞 + Auto-closing this issue, since it is most likely not useful. + + _This decision was made by a bot. If you think the bot is wrong, let us know and we'll reopen this issue._ \ No newline at end of file From da84133732819f9b83b6c3f9b749d4a7737292e6 Mon Sep 17 00:00:00 2001 From: Tobias Hagemann Date: Tue, 15 Sep 2020 16:23:31 +0200 Subject: [PATCH 3/6] allows running launcher-mac.sh from any path --- main/buildkit/src/main/resources/launcher-mac.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/main/buildkit/src/main/resources/launcher-mac.sh b/main/buildkit/src/main/resources/launcher-mac.sh index 65f8ba10d..2c06efab2 100644 --- a/main/buildkit/src/main/resources/launcher-mac.sh +++ b/main/buildkit/src/main/resources/launcher-mac.sh @@ -1,4 +1,5 @@ #!/bin/sh +cd $(dirname $0) java \ -cp "libs/*" \ -Dcryptomator.settingsPath="~/Library/Application Support/Cryptomator/settings.json" \ From 0b7f8d71ed7ce557415c19271b2c0b75b2f87a72 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Tue, 29 Sep 2020 12:12:59 +0200 Subject: [PATCH 4/6] closes #1065 --- .../ui/src/main/resources/css/light_theme.css | 10 ++++++++++ .../resources/fxml/main_window_title.fxml | 19 +++++++++++-------- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/main/ui/src/main/resources/css/light_theme.css b/main/ui/src/main/resources/css/light_theme.css index b650b6e17..c16fbe1a6 100644 --- a/main/ui/src/main/resources/css/light_theme.css +++ b/main/ui/src/main/resources/css/light_theme.css @@ -389,6 +389,16 @@ -fx-background-color: MUTED_BG; } +/* Note: These values below are kinda random such that it looks ok. I'm pretty sure there is room for improvement. Additionally, fx-text-fill does not work*/ +.badge-debug { + -fx-font-family: 'Open Sans Bold'; + -fx-font-size: 1.0em; + -fx-background-radius: 8px; + -fx-padding: 0.3em 0.55em 0.3em 0.55em; + -fx-background-color: RED_5; + -fx-background-radius: 2em; +} + /******************************************************************************* * * * Password Strength Indicator * diff --git a/main/ui/src/main/resources/fxml/main_window_title.fxml b/main/ui/src/main/resources/fxml/main_window_title.fxml index 031e48b07..54ee8b238 100644 --- a/main/ui/src/main/resources/fxml/main_window_title.fxml +++ b/main/ui/src/main/resources/fxml/main_window_title.fxml @@ -1,5 +1,6 @@ + @@ -20,7 +21,17 @@