Michael Telatynski
b3b9135b1f
Merge pull request #6134 from matrix-org/t3chguy/fix/17529
2021-06-22 21:28:51 +01:00
Travis Ralston
1180741cc2
Merge pull request #6000 from robintown/event-tile-preview-fixes
...
EventTilePreview fixes
2021-06-22 13:57:07 -06:00
Michael Telatynski
0be08b293b
Merge pull request #6233 from matrix-org/t3chguy/types/react
2021-06-22 18:22:25 +01:00
Michael Telatynski
47bddac0a6
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/types/react
2021-06-22 18:08:10 +01:00
Michael Telatynski
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
Michael Telatynski
42d33cf091
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/types/react
2021-06-22 18:03:39 +01:00
Michael Telatynski
cd04fb76dc
Fix type error
2021-06-22 18:01:29 +01:00
Michael Telatynski
28c61cca27
Remove pinned resolution for @types/react to 16.x
2021-06-22 17:56:52 +01:00
Michael Telatynski
59052b1eb7
Merge pull request #6199 from matrix-org/t3chguy/fix/17665
2021-06-22 17:46:57 +01:00
Michael Telatynski
e0aa142db7
Merge pull request #6215 from matrix-org/t3chguy/ts/5
2021-06-22 17:41:29 +01:00
Michael Telatynski
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
Michael Telatynski
55292e8beb
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/types/react
2021-06-22 17:34:05 +01:00
Michael Telatynski
59258585b3
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/5
2021-06-22 17:28:19 +01:00
Michael Telatynski
4a66794236
update copy
2021-06-22 17:26:19 +01:00
Germain
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
Germain Souquet
b092686453
improve comment grammar
2021-06-22 16:14:01 +01:00
Germain Souquet
fca2feaae8
make github env variable check first as it is new home for ci
2021-06-22 16:09:33 +01:00
Michael Telatynski
3c9cd938d0
remove spurious full stop
2021-06-22 15:29:53 +01:00
Germain
5b72423ea3
Merge pull request #6230 from matrix-org/gsouquet/fix-17051
2021-06-22 15:07:04 +01:00
Germain
ded738ce8c
Add spaces around curlies
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-06-22 14:57:44 +01:00
Michael Telatynski
c7d823d197
Merge pull request #6088 from matrix-org/t3chguy/fix/17128-1
2021-06-22 14:21:46 +01:00
Germain Souquet
c42f0fd2e4
split GITHUB_REPOSITORY rather than using GITHUB_ACTOR
2021-06-22 14:17:11 +01:00
Germain Souquet
660f3900f8
Change if statement syntax to use positive expressions
2021-06-22 14:11:41 +01:00
Michael Telatynski
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
Germain
a7daf558bb
Use proper capitalisation for Buildkite
...
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2021-06-22 13:03:55 +01:00
Germain
f56216eec5
Merge pull request #6238 from matrix-org/gsouquet/fix-17716
...
Fix modal opening race condition
2021-06-22 10:28:30 +01:00
Germain
9dee75a7b1
Merge pull request #6229 from matrix-org/gsouquet/fix-17678
2021-06-22 10:27:50 +01:00
Germain Souquet
3d3c428455
Fix DesktopBuildsNotice return type
2021-06-22 10:26:49 +01:00
Germain Souquet
db9ffe9b3e
Fix AccessibleButton label for VerificationRequest
2021-06-22 10:18:09 +01:00
Germain
e9d87478e2
Spaces before/after curlies
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-06-22 10:06:31 +01:00
Germain Souquet
3c72569270
Fix modal opening race condition
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
React 17 is hitting a race condition when a modal is closing and is trying to open another one within the same tick.
A proper long term fix would be using React.createPortal to avoid manually mounting and unmounting new React roots
2021-06-22 09:53:58 +01:00
Germain Souquet
8090d2b583
Fix branch matching for BuildKite
2021-06-22 09:31:15 +01:00
Michael Telatynski
deb075777d
Upgrade @types/react and @types/react-dom
2021-06-22 08:17:22 +01:00
Travis Ralston
9fa7ac21bd
Merge pull request #6216 from SimonBrandner/feature/pr-template
...
Add PR template
2021-06-21 14:05:58 -06:00
Michael Telatynski
dda4c8ec4c
Move Promise::allSettled typing from react-sdk to js-sdk
2021-06-21 21:04:29 +01:00
Michael Telatynski
0e4bac46f8
Merge pull request #6222 from SimonBrandner/fix/prioritise-canonical/17570
2021-06-21 20:57:24 +01:00
Michael Telatynski
845bb95887
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/5
2021-06-21 20:46:28 +01:00
Michael Telatynski
6b16b9aca6
Merge pull request #6232 from SimonBrandner/fix/quote/17715
...
Fix quote button
2021-06-21 20:29:54 +01:00
Šimon Brandner
903f898bee
Remove ComposerInsertPayload as this is a JS file
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-21 18:28:30 +02:00
RiotRobot
54c3832b5b
Resetting package fields for development
2021-06-21 16:54:41 +01:00
RiotRobot
d219c92758
Merge branch 'master' into develop
2021-06-21 16:54:40 +01:00
RiotRobot
d89710defe
v3.24.0
2021-06-21 16:53:20 +01:00
RiotRobot
ddbf0fa77f
Prepare changelog for v3.24.0
2021-06-21 16:46:20 +01:00
RiotRobot
174a43f1ef
Upgrade matrix-js-sdk to 12.0.0
2021-06-21 16:37:49 +01:00
Germain
439e5628f5
Merge pull request #6224 from matrix-org/gsouquet/fix-17707
2021-06-21 16:28:01 +01:00
Germain Souquet
ca5f8f97bb
Branch matching support for forked repository on GitHub actions
2021-06-21 16:18:13 +01:00
Germain Souquet
88d25ad6af
Fix typo in default import name
2021-06-21 15:44:09 +01:00
Germain Souquet
7825c30bf7
Improve event index initialisation failure message in search bar for supported platforms
2021-06-21 15:41:47 +01:00
Germain Souquet
7f635c68c5
Migrate SearchBar to TypeScript
2021-06-21 14:50:21 +01:00
Germain Souquet
adb42b7927
Deprecate FormButton to use AccessibleButton everywhere
2021-06-21 14:16:37 +01:00
