Skip to content

Commit 67a4a20

Browse files
authored
Merge branch 'dev' into toggle-startup-focus
Signed-off-by: Alexander Kolenaty <[email protected]>
2 parents 8f45cc5 + d4dd298 commit 67a4a20

File tree

294 files changed

+11280
-9005
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

294 files changed

+11280
-9005
lines changed

.dockerignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
node_modules
2+
.git
3+
.DS_Store
4+
*.log
5+
engine

.editorconfig

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
root = true
2+
3+
[*]
4+
indent_style = space
5+
indent_size = 2
6+
end_of_line = lf
7+
charset = utf-8
8+
trim_trailing_whitespace = true
9+
insert_final_newline = true
10+
11+
[*.md]
12+
trim_trailing_whitespace = false

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ body:
44
- type: markdown
55
attributes:
66
value: |
7-
Thank you for filing a bug report.
7+
Thank you for filing a bug report!
88
99
## Important
1010
- Please search existing issues to avoid creating duplicates.
1111
- For enhancement requests, please use GitHub Discussions.
1212
- Please fill out the template below to the best of your ability.
13+
- Please describe the issue as much as possible and provide steps to reproduce it along with visual aids if possible.
1314
- type: checkboxes
1415
id: captchas
1516
attributes:
@@ -38,7 +39,7 @@ body:
3839
id: version
3940
attributes:
4041
label: Version
41-
description: What version of our software are you running? Please DO NOT report Classic bugs.
42+
description: What version of our software are you running? Please do not use "latest" or "newest" as version numbers. Go to `Help -> About Zen` to find the version number.
4243
placeholder: 1.0.0
4344
validations:
4445
required: true
@@ -48,15 +49,18 @@ body:
4849
label: What platform are you seeing the problem on?
4950
multiple: true
5051
options:
51-
- Linux
52+
- Linux (AppImage)
53+
- Linux (Flatpak)
54+
- Linux (Tarball)
5255
- macOS - aarch64
5356
- macOS - Intel
5457
- Windows
58+
- Other
5559
validations:
5660
required: true
5761
- type: textarea
5862
id: logs
5963
attributes:
60-
label: Relevant log output
64+
label: Relevant log output if applicable
6165
description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
6266
render: shell

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
blank_issues_enabled: false
1+
blank_issues_enabled: false
22
contact_links:
33
- name: Feature Request
44
url: https://github.com/zen-browser/desktop/discussions

0 commit comments

Comments
 (0)