83296b7440
Fix typing
2021-06-22 22:19:01 +01:00
9dc8493a5c
Hide communities invites and the community autocompleter when Spaces Beta is enabled
2021-06-22 22:07:42 +01:00
1286be1ffb
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244
...
Conflicts:
src/components/views/room_settings/AliasSettings.tsx
2021-06-22 22:02:09 +01:00
5dc542f189
Iterate PR
2021-06-22 22:01:18 +01:00
c316eb841a
Merge pull request #6179 from aaronraimist/open-local-addresses
...
Open local addresses section by default when there are no existing local addresses
2021-06-22 14:48:02 -06:00
bbcd64263d
Merge pull request #6137 from matrix-org/t3chguy/fix/17282
2021-06-22 21:36:43 +01:00
d212175e63
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282
...
Conflicts:
package.json
yarn.lock
2021-06-22 21:29:52 +01:00
b3b9135b1f
Merge pull request #6134 from matrix-org/t3chguy/fix/17529
2021-06-22 21:28:51 +01:00
49d20d2530
consolidate the two onRoomAccountData listeners
2021-06-22 21:22:30 +01:00
99e3aea1e5
i18n and regen yarn lock
2021-06-22 21:17:33 +01:00
02d0999b18
Merge pull request #201 from aaronraimist/invalid-config
...
Add warning dialog when custom config.json is invalid
2021-06-22 14:16:24 -06:00
6e3c647109
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282
...
Conflicts:
package.json
src/components/views/spaces/SpacePanel.tsx
src/i18n/strings/en_EN.json
src/stores/SpaceStore.tsx
yarn.lock
2021-06-22 21:15:53 +01:00
7948aa6181
Iterate PR, improve jsdoc and switch function style
2021-06-22 21:10:29 +01:00
1180741cc2
Merge pull request #6000 from robintown/event-tile-preview-fixes
...
EventTilePreview fixes
2021-06-22 13:57:07 -06:00
cecf0ce299
Convert MessagePanel, TimelinePanel, ScrollPanel, and more to Typescript
2021-06-22 20:41:26 +01:00
5b15bc9b5d
Added translation using Weblate (Tamil)
2021-06-22 17:30:41 +00:00
54da2df8c0
Merge pull request #17723 from vector-im/t3chguy/types/react
...
Upgrade @types/react and @types/react-dom
2021-06-22 18:22:26 +01:00
0be08b293b
Merge pull request #6233 from matrix-org/t3chguy/types/react
2021-06-22 18:22:25 +01:00
6fd1dc7d18
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/7
2021-06-22 18:09:24 +01:00
47bddac0a6
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/types/react
2021-06-22 18:08:10 +01:00
d96d861983
Merge pull request #6242 from matrix-org/t3chguy/ts/fix
...
Fix type error in the SpaceStore
2021-06-22 18:08:00 +01:00
42d33cf091
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/types/react
2021-06-22 18:03:39 +01:00
505eb13461
Merge branch 'develop' of github.com:vector-im/element-web into t3chguy/types/react
2021-06-22 18:03:33 +01:00
cd04fb76dc
Fix type error
2021-06-22 18:01:29 +01:00
28c61cca27
Remove pinned resolution for @types/react to 16.x
2021-06-22 17:56:52 +01:00
c22b195bbd
Remove pinned resolution for @types/react to 16.x
2021-06-22 17:56:52 +01:00
59052b1eb7
Merge pull request #6199 from matrix-org/t3chguy/fix/17665
2021-06-22 17:46:57 +01:00
e0aa142db7
Merge pull request #6215 from matrix-org/t3chguy/ts/5
2021-06-22 17:41:29 +01:00
e3e6b74272
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17665
...
Conflicts:
src/stores/SpaceStore.tsx
2021-06-22 17:38:05 +01:00
55292e8beb
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/types/react
2021-06-22 17:34:05 +01:00
59258585b3
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/5
2021-06-22 17:28:19 +01:00
4a66794236
update copy
2021-06-22 17:26:19 +01:00
a839d0f396
More typescript conversion
2021-06-22 17:23:13 +01:00
6d92953311
Convert bunch of utils to TS
2021-06-22 17:22:38 +01:00
cbfab29a5c
Merge pull request #6236 from matrix-org/gsouquet/bk-branch-matching
...
Fix branch matching for Buildkite
2021-06-22 16:44:15 +01:00
b092686453
improve comment grammar
2021-06-22 16:14:01 +01:00
fca2feaae8
make github env variable check first as it is new home for ci
2021-06-22 16:09:33 +01:00
d0dc5cf347
Update early MSC3083 support
2021-06-22 16:07:05 +01:00
6b4e6f6be6
Merge pull request #215 from alarsyo/develop
2021-06-22 15:43:27 +01:00
10a11242ff
Don't show Quit warning on keyUp residual event
...
The warning triggered whenever the app got focus after another window
was closed with a Ctrl+Q shortcut and the keys were then released.
Hitting the 'Close Element' button didn't even close the app in this
case, as only the warning handler was triggered, not the actual quit
shortcut (which does discriminate between key press and key release).
Actually checking for 'keyDown' should prevent this from occurring
again.
Fixes vector-im/element-web#17714
Signed-off-by: Antoine Martin <antoine@alarsyo.net >
2021-06-22 16:35:36 +02:00
3c9cd938d0
remove spurious full stop
2021-06-22 15:29:53 +01:00
5b72423ea3
Merge pull request #6230 from matrix-org/gsouquet/fix-17051
2021-06-22 15:07:04 +01:00
ded738ce8c
Add spaces around curlies
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com >
2021-06-22 14:57:44 +01:00
1805a28d51
Merge pull request #17457 from vector-im/t3chguy/fix/17128-1
2021-06-22 14:21:46 +01:00
c7d823d197
Merge pull request #6088 from matrix-org/t3chguy/fix/17128-1
2021-06-22 14:21:46 +01:00
c42f0fd2e4
split GITHUB_REPOSITORY rather than using GITHUB_ACTOR
2021-06-22 14:17:11 +01:00
660f3900f8
Change if statement syntax to use positive expressions
2021-06-22 14:11:41 +01:00
847e3dcbce
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17128-1
...
Conflicts:
src/dispatcher/actions.ts
2021-06-22 14:11:37 +01:00
a7daf558bb
Use proper capitalisation for Buildkite
...
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com >
2021-06-22 13:03:55 +01:00
a85c6c67e0
Make waveform update match the screen refresh rate
2021-06-22 12:28:23 +01:00
Michael Telatynski