Jaiwanth
|
08d886e9d1
|
Delint
|
2021-06-30 14:08:22 +05:30 |
|
Jaiwanth
|
551639811b
|
Merge and resolve conflicts
|
2021-06-30 12:29:13 +05:30 |
|
Jaiwanth
|
7d5db4689c
|
Disable close icon during export
|
2021-06-30 10:03:33 +05:30 |
|
Michael Telatynski
|
29904a7ffc
|
Merge pull request #6263 from matrix-org/t3chguy/ts/4
|
2021-06-29 22:31:16 +01:00 |
|
Michael Telatynski
|
3fa89f3294
|
Merge pull request #6243 from matrix-org/t3chguy/ts/8
|
2021-06-29 22:27:16 +01:00 |
|
Michael Telatynski
|
6250d9ba61
|
Merge branch 'develop' into t3chguy/ts/4
|
2021-06-29 22:24:47 +01:00 |
|
Michael Telatynski
|
a59e94b907
|
delint
|
2021-06-29 22:21:05 +01:00 |
|
Michael Telatynski
|
8f4879ea96
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/8
Conflicts:
src/components/structures/MessagePanel.tsx
src/components/structures/ScrollPanel.tsx
src/components/structures/TimelinePanel.tsx
src/components/views/elements/ErrorBoundary.tsx
src/components/views/elements/EventListSummary.tsx
src/components/views/messages/TileErrorBoundary.tsx
|
2021-06-29 22:14:40 +01:00 |
|
J. Ryan Stinnett
|
9d6d8fc666
|
Merge pull request #6285 from matrix-org/jryans/rework-linting-2
Migrate to `eslint-plugin-matrix-org`
|
2021-06-29 17:45:10 +01:00 |
|
Germain
|
55121f6e81
|
Merge pull request #6287 from matrix-org/gsouquet/fix-17836
Avoid cyclic dependencies by moving watchers out of constructor
|
2021-06-29 17:23:13 +01:00 |
|
Germain Souquet
|
d035151116
|
Avoid cyclic dependencies by moving watchers out of constructor
|
2021-06-29 17:04:51 +01:00 |
|
Germain
|
9a37f29841
|
Merge pull request #6284 from matrix-org/gsouquet/fix-17826
Add spacing between toast buttons with cross browser support in mind
|
2021-06-29 15:32:14 +01:00 |
|
J. Ryan Stinnett
|
07f057f381
|
Keep indent rule enabled
|
2021-06-29 15:30:38 +01:00 |
|
J. Ryan Stinnett
|
782e793925
|
Merge remote-tracking branch 'origin/develop' into jryans/rework-linting-2
|
2021-06-29 15:27:24 +01:00 |
|
J. Ryan Stinnett
|
21b8c81eb8
|
Merge remote-tracking branch 'origin/develop' into jryans/rework-linting-2
|
2021-06-29 15:25:30 +01:00 |
|
Michael Telatynski
|
623317cd47
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/8
Conflicts:
src/components/structures/MessagePanel.tsx
src/components/structures/TimelinePanel.tsx
|
2021-06-29 15:22:54 +01:00 |
|
Germain
|
640fc591bb
|
Merge pull request #6279 from matrix-org/gsouquet/deprecate-tinter
Deprecate Tinter and TintableSVG
|
2021-06-29 15:22:48 +01:00 |
|
Germain
|
78f1748634
|
Merge pull request #6283 from matrix-org/gsouquet/filepanel-typescript
|
2021-06-29 15:15:29 +01:00 |
|
Jaiwanth
|
b0be7d2861
|
Add license and negate the conditional
|
2021-06-29 19:43:21 +05:30 |
|
David Baker
|
38e5ac787c
|
Merge pull request #6286 from RiotTranslateBot/weblate-element-web-matrix-react-sdk
Translations update from Weblate
|
2021-06-29 14:15:00 +01:00 |
|
Govindas
|
d68fa223bc
|
Translated using Weblate (Lithuanian)
Currently translated at 65.5% (1941 of 2961 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/lt/
|
2021-06-29 13:08:42 +00:00 |
|
Weblate
|
0b4cb9af54
|
Merge branch 'origin/develop' into Weblate.
|
2021-06-29 13:02:29 +00:00 |
|
Priit Jõerüüt
|
8d79a10135
|
Translated using Weblate (Estonian)
Currently translated at 99.8% (2988 of 2993 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
|
2021-06-29 13:02:26 +00:00 |
|
Govindas
|
7df42b1bdb
|
Translated using Weblate (Lithuanian)
Currently translated at 65.1% (1951 of 2993 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/lt/
|
2021-06-29 13:02:24 +00:00 |
|
libexus
|
f35fe7c57f
|
Translated using Weblate (German)
Currently translated at 99.8% (2988 of 2993 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
|
2021-06-29 13:02:12 +00:00 |
|
J. Ryan Stinnett
|
0551becafd
|
Fix long lines
|
2021-06-29 13:42:51 +01:00 |
|
J. Ryan Stinnett
|
fe123fc605
|
Rework lint comments
|
2021-06-29 13:35:43 +01:00 |
|
J. Ryan Stinnett
|
bbdd93f592
|
Auto-fix more errors
|
2021-06-29 13:26:09 +01:00 |
|
J. Ryan Stinnett
|
b501665971
|
Fix parsing errors
|
2021-06-29 13:23:13 +01:00 |
|
J. Ryan Stinnett
|
2be40ad08a
|
Use unquoted keys
|
2021-06-29 13:19:42 +01:00 |
|
J. Ryan Stinnett
|
a4f8ca4f8a
|
Switch to newer Babel specific config
|
2021-06-29 13:18:58 +01:00 |
|
J. Ryan Stinnett
|
ae0a8b8da4
|
Auto-fix lint errors
|
2021-06-29 13:11:58 +01:00 |
|
J. Ryan Stinnett
|
4c5720a573
|
Update lint comments
|
2021-06-29 12:51:13 +01:00 |
|
J. Ryan Stinnett
|
71116bfa27
|
Migrate to eslint-plugin-matrix-org
This migrates to the new plugin form of our custom ESLint configs. As part of
this, some packages are de-duplicated, configs streamlined, etc.
|
2021-06-29 12:51:13 +01:00 |
|
J. Ryan Stinnett
|
2d3163fef5
|
Remove Flow support
We no longer use Flow, so this removes linting and compiling support. New code
should use TypeScript for static typing.
|
2021-06-29 12:31:44 +01:00 |
|
Germain Souquet
|
db015519ed
|
Code style changes for FilePanel
|
2021-06-29 12:19:27 +01:00 |
|
Germain
|
56e05041fd
|
Import curly spaces
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
|
2021-06-29 12:13:41 +01:00 |
|
Germain Souquet
|
4cfdad8aa2
|
Add spacing between toast buttons with cross browser support in mind
|
2021-06-29 11:59:13 +01:00 |
|
Germain Souquet
|
652f57371a
|
Migrate FilePanel to TypeScript
|
2021-06-29 11:38:19 +01:00 |
|
Michael Telatynski
|
b70297c510
|
Merge pull request #6277 from matrix-org/t3chguy/fix/17793
Fix back button on user info card after clicking a permalink
|
2021-06-29 10:55:53 +01:00 |
|
Michael Telatynski
|
b60c2c5d55
|
Fix e2e test right panel back behaviour
|
2021-06-29 10:37:30 +01:00 |
|
J. Ryan Stinnett
|
14ef38e057
|
Merge pull request #6280 from robintown/group-acls
Group ACLs with MELS
|
2021-06-29 10:02:12 +01:00 |
|
Michael Telatynski
|
0cc7f42f08
|
Merge pull request #6282 from matrix-org/t3chguy/fix/17738
Fix editState not getting passed through
|
2021-06-29 09:14:17 +01:00 |
|
Jaiwanth
|
497d8102e2
|
Handle mxc urls for non-encrypted rooms
|
2021-06-29 12:54:44 +05:30 |
|
Michael Telatynski
|
26592da09f
|
Merge pull request #5671 from weeman1337/msg-context-menu
|
2021-06-29 08:18:07 +01:00 |
|
Michael Telatynski
|
298bf30b18
|
Fix editState not getting passed through
|
2021-06-29 08:16:43 +01:00 |
|
Jaiwanth
|
747273cc9c
|
Convert input's value to string to use existing types
|
2021-06-29 12:06:58 +05:30 |
|
Jaiwanth
|
3fc4be0be9
|
Add return types to ABC Exporter
|
2021-06-29 11:40:26 +05:30 |
|
Jaiwanth
|
637e3afa48
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
|
2021-06-29 11:31:30 +05:30 |
|
Jaiwanth
|
6cbbc0ecb4
|
Replace hard coded forExport string by mxc url
|
2021-06-29 11:29:05 +05:30 |
|