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
Germain Souquet
ca123d3c4d
Migrate MKeyVerificationRequest to TypeScript
2021-06-21 14:05:56 +01:00
Germain Souquet
d2595dcd61
use TruncatedList to improve ForwardDialog rendering time
2021-06-21 12:29:59 +01:00
Germain Souquet
9756a99220
Migrate TruncatedList to TypeScript
2021-06-21 12:14:30 +01:00
J. Ryan Stinnett
b6e0068822
Merge pull request #6225 from matrix-org/jryans/repair-decrypted-source
...
Fix View Source accessing renamed private field on MatrixEvent
2021-06-21 10:09:36 +01:00
Germain Souquet
2d9e97a3e1
Fix branch matching to work with GitHub Actions and BuildKite
2021-06-21 09:47:46 +01:00
Michael Telatynski
e79b7d7adb
Fix View Source accessing renamed private field on MatrixEvent
2021-06-21 09:45:22 +01:00
Michael Telatynski
6c64f564e4
Naive attempt at improving our end-to-end tests in Github Actions
2021-06-21 09:14:44 +01:00
Michael Telatynski
b380e43e4f
Merge pull request #6219 from matrix-org/t3chguy/ts/6
...
Fix ConfirmUserActionDialog returning an input field rather than text
2021-06-21 08:53:43 +01:00
Šimon Brandner
7bf230e665
Prefer canonical aliases over non-canonical ones
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-20 11:17:42 +02:00
Šimon Brandner
d0ea842f1e
Remove sorting by index as it is already done here: e9ea3cad76/src/autocomplete/QueryMatcher.ts (L120)
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-20 10:29:08 +02:00
Travis Ralston
e9ea3cad76
Merge pull request #6221 from matrix-org/revert-6196-travis/event-fixes
...
Revert "Partially restore immutable event objects at the rendering layer"
2021-06-19 13:43:30 -06:00
Travis Ralston
9344adb2d2
Revert "Partially restore immutable event objects at the rendering layer"
2021-06-19 13:38:19 -06:00
Michael Telatynski
8e2a7cc3f6
Convert crypto index to TS
2021-06-19 19:41:45 +01:00
Šimon Brandner
21a960acc7
Fix timestamp issues
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-19 17:53:00 +02:00
Šimon Brandner
c0f34c9a01
Merge remote-tracking branch 'upstream/develop' into fix/irc-layout-mxid/17648
2021-06-19 17:24:30 +02:00
Michael Telatynski
2c5ddea1d9
Fix ConfirmUserActionDialog returning an input field rather than text
2021-06-19 15:57:07 +01:00
Michael Telatynski
a2a5158411
Fix View Source accessing renamed private field on MatrixEvent
2021-06-19 15:37:48 +01:00
Michael Telatynski
be10e77704
Improve typing of Event Index Manager / Seshat
2021-06-19 15:37:06 +01:00
Michael Telatynski
2c66adcb0e
Merge pull request #6218 from matrix-org/t3chguy/ci-jq
...
Add jq to e2e tests Dockerfile
2021-06-18 19:27:37 +01:00
Michael Telatynski
4ff25c5978
Add jq to e2e tests Dockerfile
2021-06-18 19:16:39 +01:00
Travis Ralston
89240c377b
Merge pull request #6196 from matrix-org/travis/event-fixes
...
Partially restore immutable event objects at the rendering layer
2021-06-18 11:32:57 -06:00
Michael Telatynski
958d4df957
Naive attempt at improving our end-to-end tests in Github Actions
2021-06-18 18:32:45 +01:00
Travis Ralston
273fb75fc9
Merge branch 'develop' into travis/event-fixes
2021-06-18 11:26:51 -06:00
Michael Telatynski
8a3dc1bbdf
fix tests
2021-06-18 17:56:18 +01:00
David Teller
77a4d345bd
Submitting abuse reports to moderators ( #6213 )
...
This patch is part of MSC3215. It implements `feature_report_to_moderator`
to let end-users send report to room moderators instead of homeserver
administrators.
This only works if the room has been setup for moderation, something that
does not have a UX yet.
Signed-off-by: David Teller <davidt@element.io>
2021-06-18 18:09:02 +02:00
Šimon Brandner
f193f8a211
Merge remote-tracking branch 'upstream/develop' into feature/pr-template
2021-06-18 17:35:22 +02:00
Šimon Brandner
335b105506
Add PR template
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-18 17:29:12 +02:00
Michael Telatynski
ab94b284b8
Updates around the use of private fields out of class
2021-06-18 16:29:10 +01:00
Travis Ralston
bc74a7366b
Merge pull request #6197 from matrix-org/travis/voice-messages/fix-msc-number
...
Update MSC number references for voice messages
2021-06-18 09:23:28 -06:00
Michael Telatynski
233e2aa425
Fix bugs identified by the typescripting
2021-06-18 16:22:31 +01:00
Michael Telatynski
0ae4e7b11d
Fix typescript types
2021-06-18 16:21:46 +01:00
Michael Telatynski
3b7c92fd9e
Use new js-sdk types properly
2021-06-18 16:18:42 +01:00
Michael Telatynski
058cbbbd0c
Fix imports
2021-06-18 16:13:55 +01:00
Michael Telatynski
9cce5ef10f
Consolidate types with js-sdk changes
2021-06-18 15:31:12 +01:00
J. Ryan Stinnett
f34086aa3c
Merge pull request #6214 from matrix-org/jryans/enc-phase-ts
...
Fix phase enum usage in JS modules as well
2021-06-18 14:13:31 +01:00
