Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into feat/bimi
Browse files Browse the repository at this point in the history
  • Loading branch information
ChristophWurst committed Dec 5, 2023
2 parents e2eec3a + c18a1e4 commit 4ff6c3f
Show file tree
Hide file tree
Showing 1,040 changed files with 110,520 additions and 52,823 deletions.
4 changes: 4 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,7 @@ indent_size = 4
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true

[*.{yml,yaml}]
indent_style = space
indent_size = 2
5 changes: 4 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,8 @@ module.exports = {
t: true,
__webpack_public_path__: true,
__webpack_nonce__: true,
}
},
rules: {
'jsdoc/require-jsdoc': 'off',
},
}
3 changes: 2 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
CHANGELOG.md merge=union
/CHANGELOG.md merge=union
/vendor-bin/**/composer.lock binary
2 changes: 2 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# App maintainers
* @ChristophWurst
39 changes: 0 additions & 39 deletions .github/ISSUE_TEMPLATE/bug.md

This file was deleted.

94 changes: 94 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report_form.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
name: "Bug"
description: "Have you encountered a bug? Submit a report and help us improve Nextcloud Mail"
labels: ["bug", "0. to triage"]
body:
- type: textarea
id: reproduce
attributes:
label: Steps to reproduce
description: |
Describe the steps to reproduce the bug.
The better your description is _(go 'here', click 'there'...)_ the fastest you'll get an _(accurate)_ answer.
value: |
1.
2.
3.
validations:
required: true
- type: textarea
id: Expected-behavior
attributes:
label: Expected behavior
description: |
Tell us what should happen
validations:
required: true
- type: textarea
id: actual-behavior
attributes:
label: Actual behavior
description: Tell us what happens instead
validations:
required: true
- type: input
id: mail-app-version
attributes:
label: Mail app version
description: |
See apps admin page, e.g. 0.5.3
- type: input
id: mail-server-service
attributes:
label: Mailserver or service
description: |
e.g. Outlook, Yahoo, Gmail, Exchange...
- type: input
id: system
attributes:
label: Operating system
description: |
Write down the operating system where Nextcloud Mail app is installed.
- type: dropdown
id: php
attributes:
label: PHP engine version
description: |
Select PHP engine version serving Nextcloud Server.
_Describe in the "Additional info" section if you chose "Other"._
options:
- "PHP 7.4"
- "PHP 8.0"
- "PHP 8.1"
- "PHP 8.2"
- "Other"
- type: dropdown
id: webserver
attributes:
label: Web server
description: |
Select Webserver serving Nextcloud Server.
_Describe in the "Additional info" section if you chose "Other"._
options:
- "Apache (supported)"
- "Nginx"
- "Lighttpd"
- "Other"
- type: dropdown
id: database
attributes:
label: Database
description: |
Select Database engine serving Nextcloud Server.
_Describe in the "Additional info" section if you chose "Other"._
options:
- "MySQL"
- "MariaDB"
- "PostgreSQL"
- "SQLite"
- "Oracle"
- "Other"
- type: textarea
id: additional-info
attributes:
label: Additional info
description: Any additional information related to the issue (ex. browser console errors, software versions).
8 changes: 8 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
blank_issues_enabled: false
contact_links:
- name: Support and Help
url: https://help.nextcloud.com/c/apps/mail/35
about: Ask a question or seek for help
- name: Security issue
url: https://hackerone.com/nextcloud
about: Report a security issue
16 changes: 0 additions & 16 deletions .github/ISSUE_TEMPLATE/feature_request.md

This file was deleted.

28 changes: 28 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: "Feature request"
description: "You have a neat idea that should be implemented?"
labels: ["enhancement", "0. to triage"]
body:
- type: textarea
id: description-problem
attributes:
label: Is your feature request related to a problem? Please describe.
description: |
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
- type: textarea
id: description-solution
attributes:
label: Describe the solution you'd like
description: |
A clear and concise description of what you want to happen.
- type: textarea
id: description-alternatives
attributes:
label: Describe alternatives you've considered
description: |
A clear and concise description of any alternative solutions or features you've considered.
- type: textarea
id: additional-context
attributes:
label: Additional context
description: |
Add any other context or screenshots about the feature request here.
13 changes: 0 additions & 13 deletions .github/ISSUE_TEMPLATE/question.md

This file was deleted.

82 changes: 0 additions & 82 deletions .github/dependabot.yml

This file was deleted.

Loading

0 comments on commit 4ff6c3f

Please sign in to comment.