-
-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into feature/default-pin-drop
- Loading branch information
Showing
208 changed files
with
10,791 additions
and
8,193 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,70 +1,90 @@ | ||
| module.exports = { | ||
| plugins: ["matrix-org"], | ||
| extends: [ | ||
| "plugin:matrix-org/babel", | ||
| "plugin:matrix-org/react", | ||
| ], | ||
| extends: ["plugin:matrix-org/babel", "plugin:matrix-org/react"], | ||
| env: { | ||
| browser: true, | ||
| node: true, | ||
| }, | ||
| rules: { | ||
| // Things we do that break the ideal style | ||
| "quotes": "off", | ||
| quotes: "off", | ||
| }, | ||
| settings: { | ||
| react: { | ||
| version: 'detect' | ||
| } | ||
| version: "detect", | ||
| }, | ||
| }, | ||
| overrides: [{ | ||
| files: ["src/**/*.{ts,tsx}", "module_system/**/*.{ts,tsx}"], | ||
| extends: [ | ||
| "plugin:matrix-org/typescript", | ||
| "plugin:matrix-org/react", | ||
| ], | ||
| rules: { | ||
| // Things we do that break the ideal style | ||
| "prefer-promise-reject-errors": "off", | ||
| "quotes": "off", | ||
| overrides: [ | ||
| { | ||
| files: ["src/**/*.{ts,tsx}", "test/**/*.{ts,tsx}", "module_system/**/*.{ts,tsx}"], | ||
| extends: ["plugin:matrix-org/typescript", "plugin:matrix-org/react"], | ||
| // NOTE: These rules are frozen and new rules should not be added here. | ||
| // New changes belong in https://github.com/matrix-org/eslint-plugin-matrix-org/ | ||
| rules: { | ||
| // Things we do that break the ideal style | ||
| "prefer-promise-reject-errors": "off", | ||
| "quotes": "off", | ||
|
|
||
| // We disable this while we're transitioning | ||
| "@typescript-eslint/no-explicit-any": "off", | ||
| // We're okay with assertion errors when we ask for them | ||
| "@typescript-eslint/no-non-null-assertion": "off", | ||
| // We disable this while we're transitioning | ||
| "@typescript-eslint/no-explicit-any": "off", | ||
| // We're okay with assertion errors when we ask for them | ||
| "@typescript-eslint/no-non-null-assertion": "off", | ||
|
|
||
| // Ban matrix-js-sdk/src imports in favour of matrix-js-sdk/src/matrix imports to prevent unleashing hell. | ||
| "no-restricted-imports": ["error", { | ||
| "paths": [{ | ||
| "name": "matrix-js-sdk", | ||
| "message": "Please use matrix-js-sdk/src/matrix instead", | ||
| }, { | ||
| "name": "matrix-js-sdk/", | ||
| "message": "Please use matrix-js-sdk/src/matrix instead", | ||
| }, { | ||
| "name": "matrix-js-sdk/src", | ||
| "message": "Please use matrix-js-sdk/src/matrix instead", | ||
| }, { | ||
| "name": "matrix-js-sdk/src/", | ||
| "message": "Please use matrix-js-sdk/src/matrix instead", | ||
| }, { | ||
| "name": "matrix-js-sdk/src/index", | ||
| "message": "Please use matrix-js-sdk/src/matrix instead", | ||
| }, { | ||
| "name": "matrix-react-sdk", | ||
| "message": "Please use matrix-react-sdk/src/index instead", | ||
| }, { | ||
| "name": "matrix-react-sdk/", | ||
| "message": "Please use matrix-react-sdk/src/index instead", | ||
| }], | ||
| "patterns": [{ | ||
| "group": ["matrix-js-sdk/lib", "matrix-js-sdk/lib/", "matrix-js-sdk/lib/**"], | ||
| "message": "Please use matrix-js-sdk/src/* instead", | ||
| }, { | ||
| "group": ["matrix-react-sdk/lib", "matrix-react-sdk/lib/", "matrix-react-sdk/lib/**"], | ||
| "message": "Please use matrix-react-sdk/src/* instead", | ||
| }], | ||
| }], | ||
| // Ban matrix-js-sdk/src imports in favour of matrix-js-sdk/src/matrix imports to prevent unleashing hell. | ||
| "no-restricted-imports": [ | ||
| "error", | ||
| { | ||
| paths: [ | ||
| { | ||
| name: "matrix-js-sdk", | ||
| message: "Please use matrix-js-sdk/src/matrix instead", | ||
| }, | ||
| { | ||
| name: "matrix-js-sdk/", | ||
| message: "Please use matrix-js-sdk/src/matrix instead", | ||
| }, | ||
| { | ||
| name: "matrix-js-sdk/src", | ||
| message: "Please use matrix-js-sdk/src/matrix instead", | ||
| }, | ||
| { | ||
| name: "matrix-js-sdk/src/", | ||
| message: "Please use matrix-js-sdk/src/matrix instead", | ||
| }, | ||
| { | ||
| name: "matrix-js-sdk/src/index", | ||
| message: "Please use matrix-js-sdk/src/matrix instead", | ||
| }, | ||
| { | ||
| name: "matrix-react-sdk", | ||
| message: "Please use matrix-react-sdk/src/index instead", | ||
| }, | ||
| { | ||
| name: "matrix-react-sdk/", | ||
| message: "Please use matrix-react-sdk/src/index instead", | ||
| }, | ||
| ], | ||
| patterns: [ | ||
| { | ||
| group: ["matrix-js-sdk/lib", "matrix-js-sdk/lib/", "matrix-js-sdk/lib/**"], | ||
| message: "Please use matrix-js-sdk/src/* instead", | ||
| }, | ||
| { | ||
| group: ["matrix-react-sdk/lib", "matrix-react-sdk/lib/", "matrix-react-sdk/lib/**"], | ||
| message: "Please use matrix-react-sdk/src/* instead", | ||
| }, | ||
| ], | ||
| }, | ||
| ], | ||
| }, | ||
| }, | ||
| }], | ||
| { | ||
| files: ["test/**/*.{ts,tsx}"], | ||
| rules: { | ||
| // We don't need super strict typing in test utilities | ||
| "@typescript-eslint/explicit-function-return-type": "off", | ||
| "@typescript-eslint/explicit-member-accessibility": "off", | ||
| }, | ||
| }, | ||
| ], | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| # prettier | ||
| 7921a6cbf86b035d2b0c1daecb4c24beaf5a5abc |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,4 @@ | ||
| * @vector-im/element-web | ||
| * @vector-im/element-web | ||
| /.github/workflows/** @vector-im/element-web-app-team | ||
| /package.json @vector-im/element-web-app-team | ||
| /yarn.lock @vector-im/element-web-app-team |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,75 +2,75 @@ name: Bug report for the Element desktop app (not in a browser) | |
| description: File a bug report if you are using the desktop Element application. | ||
| labels: [T-Defect] | ||
| body: | ||
| - type: markdown | ||
| attributes: | ||
| value: | | ||
| Thanks for taking the time to fill out this bug report! | ||
| - type: markdown | ||
| attributes: | ||
| value: | | ||
| Thanks for taking the time to fill out this bug report! | ||
| Please report security issues by email to [email protected] | ||
| - type: textarea | ||
| id: reproduction-steps | ||
| attributes: | ||
| label: Steps to reproduce | ||
| description: Please attach screenshots, videos or logs if you can. | ||
| placeholder: Tell us what you see! | ||
| value: | | ||
| 1. Where are you starting? What can you see? | ||
| 2. What do you click? | ||
| 3. More steps… | ||
| validations: | ||
| required: true | ||
| - type: textarea | ||
| id: result | ||
| attributes: | ||
| label: Outcome | ||
| placeholder: Tell us what went wrong | ||
| value: | | ||
| #### What did you expect? | ||
| Please report security issues by email to [email protected] | ||
| - type: textarea | ||
| id: reproduction-steps | ||
| attributes: | ||
| label: Steps to reproduce | ||
| description: Please attach screenshots, videos or logs if you can. | ||
| placeholder: Tell us what you see! | ||
| value: | | ||
| 1. Where are you starting? What can you see? | ||
| 2. What do you click? | ||
| 3. More steps… | ||
| validations: | ||
| required: true | ||
| - type: textarea | ||
| id: result | ||
| attributes: | ||
| label: Outcome | ||
| placeholder: Tell us what went wrong | ||
| value: | | ||
| #### What did you expect? | ||
| #### What happened instead? | ||
| validations: | ||
| required: true | ||
| - type: input | ||
| id: os | ||
| attributes: | ||
| label: Operating system | ||
| placeholder: Windows, macOS, Ubuntu, Arch Linux… | ||
| validations: | ||
| required: false | ||
| - type: input | ||
| id: version | ||
| attributes: | ||
| label: Application version | ||
| description: You can find the version information in Settings -> Help & About. | ||
| placeholder: e.g. Element version 1.7.34, olm version 3.2.3 | ||
| validations: | ||
| required: false | ||
| - type: input | ||
| id: source | ||
| attributes: | ||
| label: How did you install the app? | ||
| description: Where did you install the app from? Please give a link or a description. | ||
| placeholder: e.g. From https://element.io/get-started | ||
| validations: | ||
| required: false | ||
| - type: input | ||
| id: homeserver | ||
| attributes: | ||
| label: Homeserver | ||
| description: | | ||
| Which server is your account registered on? If it is a local or non-public homeserver, please tell us what is the homeserver implementation (ex: Synapse/Dendrite/etc.) and the version. | ||
| placeholder: e.g. matrix.org or Synapse 1.50.0rc1 | ||
| validations: | ||
| required: false | ||
| - type: dropdown | ||
| id: rageshake | ||
| attributes: | ||
| label: Will you send logs? | ||
| description: | | ||
| Did you know that you can send a /rageshake command from your application to submit logs for this issue? Trigger the defect, then type `/rageshake` into the message input area followed by a description of the problem and send the command. You will be able to add a link to this defect report and submit anonymous logs to the developers. | ||
| options: | ||
| - 'Yes' | ||
| - 'No' | ||
| validations: | ||
| required: true | ||
| #### What happened instead? | ||
| validations: | ||
| required: true | ||
| - type: input | ||
| id: os | ||
| attributes: | ||
| label: Operating system | ||
| placeholder: Windows, macOS, Ubuntu, Arch Linux… | ||
| validations: | ||
| required: false | ||
| - type: input | ||
| id: version | ||
| attributes: | ||
| label: Application version | ||
| description: You can find the version information in Settings -> Help & About. | ||
| placeholder: e.g. Element version 1.7.34, olm version 3.2.3 | ||
| validations: | ||
| required: false | ||
| - type: input | ||
| id: source | ||
| attributes: | ||
| label: How did you install the app? | ||
| description: Where did you install the app from? Please give a link or a description. | ||
| placeholder: e.g. From https://element.io/get-started | ||
| validations: | ||
| required: false | ||
| - type: input | ||
| id: homeserver | ||
| attributes: | ||
| label: Homeserver | ||
| description: | | ||
| Which server is your account registered on? If it is a local or non-public homeserver, please tell us what is the homeserver implementation (ex: Synapse/Dendrite/etc.) and the version. | ||
| placeholder: e.g. matrix.org or Synapse 1.50.0rc1 | ||
| validations: | ||
| required: false | ||
| - type: dropdown | ||
| id: rageshake | ||
| attributes: | ||
| label: Will you send logs? | ||
| description: | | ||
| Did you know that you can send a /rageshake command from your application to submit logs for this issue? Trigger the defect, then type `/rageshake` into the message input area followed by a description of the problem and send the command. You will be able to add a link to this defect report and submit anonymous logs to the developers. | ||
| options: | ||
| - "Yes" | ||
| - "No" | ||
| validations: | ||
| required: true | ||
Oops, something went wrong.