c0f34c9a01
Merge remote-tracking branch 'upstream/develop' into fix/irc-layout-mxid/17648
2021-06-19 17:24:30 +02:00
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
4ff25c5978
Add jq to e2e tests Dockerfile
2021-06-18 19:16:39 +01:00
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
273fb75fc9
Merge branch 'develop' into travis/event-fixes
2021-06-18 11:26:51 -06:00
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
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
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
538165d515
Fix phase enum usage in JS modules as well
...
https://github.com/matrix-org/matrix-react-sdk/pull/6185 converted
`SetupEncryptionStore` to TS, including moving the phase states to an enum. The
calling JS modules were forgotten, so they got a bit confused.
Fixes https://github.com/vector-im/element-web/issues/17689
Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/6185
2021-06-18 14:05:12 +01:00
2fd919e5c7
Merge pull request #6185 from matrix-org/gsouquet/dialogs-ts-migration
2021-06-18 12:56:39 +01:00
fcda0604e0
Fix RoomMember import
2021-06-18 12:48:31 +01:00
d22617c422
More specific type definition and adhering to code style better
2021-06-18 12:44:15 +01:00
3f1ca970d6
Merge branch 'develop' into gsouquet/dialogs-ts-migration
2021-06-18 12:27:00 +01:00
dddc32d870
Merge pull request #6208 from matrix-org/t3chguy/ts/5
2021-06-18 09:49:03 +01:00
d9caa3533b
Merge pull request #5858 from matrix-org/t3chguy/fix/12740
2021-06-18 08:22:21 +01:00
98e0200b4a
Function name
2021-06-17 14:21:50 -06:00
a687391b98
Switch order
2021-06-17 14:21:01 -06:00
71ff5248fe
Merge pull request #6082 from SimonBrandner/fix/mute-incoming-call/15591
2021-06-17 16:41:00 +01:00
f38cd38bd3
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/12740
...
Conflicts:
src/components/structures/TimelinePanel.js
src/components/views/context_menus/MessageContextMenu.js
src/components/views/right_panel/UserInfo.tsx
src/dispatcher/actions.ts
2021-06-17 15:31:06 +01:00
017e0ba40f
fix more private field accesses in tests
2021-06-17 15:23:29 +01:00
2e73647a85
Fix tests by updating private field names and spies
2021-06-17 15:18:52 +01:00
3e38d92fa4
Fix up some more type defs
2021-06-17 14:49:27 +01:00
9f83846ecc
Remove redundant word from GitHub Actions workflow
2021-06-17 14:35:33 +01:00
02e72d8b04
Fix more type definitions
2021-06-17 14:24:53 +01:00
f929d2ee5f
Typescript fixes due to MatrixEvent being TSified
2021-06-17 14:06:03 +01:00
97e6599780
Merge pull request #6207 from matrix-org/t3chguy/ts/5
...
Fix types in SlashCommands
2021-06-17 12:15:16 +01:00
cce4ccb157
Fix types in SlashCommands which assumed something was a promise but it wasn't
2021-06-17 11:37:06 +01:00
782adbc41e
Merge pull request #6190 from matrix-org/gsouquet/performance-tracking-markers
2021-06-17 10:27:33 +01:00
48e090abcc
Remove unnecessary comment
2021-06-17 10:20:43 +01:00
6e827ad4c9
Merge pull request #6204 from robintown/forward-dialog-display-name
...
Fix forward dialog message preview display names
2021-06-17 10:10:54 +01:00
2f1abe251f
Merge pull request #6206 from matrix-org/gsouquet/fix-17672
...
Remove stray bullet point in reply preview
2021-06-17 08:58:47 +01:00
1a08af8ccf
remove stray bullet point in reply preview
2021-06-17 08:45:09 +01:00
ce57b66c91
Fix forward dialog message preview display names
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-16 18:17:25 -04:00
ad3aefad35
Merge pull request #6203 from matrix-org/jryans/nested-reply-perf
...
Stop requesting null next replies from the server
2021-06-16 20:17:53 +01:00
8f02ca8ce9
Stop requesting null next replies from the server
...
A recent change (47e007e08fhttps://github.com/vector-im/element-web/issues/17563
Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/6079
2021-06-16 18:04:41 +01:00
dbdb61c820
Improve the mxid overlap situation
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-16 17:21:29 +02:00
ccf30ed94c
Merge pull request #6202 from matrix-org/t3chguy/fix/17669
2021-06-16 12:46:44 +01:00
ab964339d2
Add another setState skip to prevent redundant state updates
2021-06-16 12:11:17 +01:00
626d575820
tidy AuxPanel TS
2021-06-16 12:07:58 +01:00
d87325ae6a
Small cleanup around the room status bar and auxpanel to prevent redundant state updates
2021-06-16 12:06:41 +01:00
e3a6ce13cd
Fix tight-loop update issue caused by a broken shouldComponentUpdate
2021-06-16 12:04:37 +01:00
deb2e8d679
Remove unused methods
2021-06-16 12:04:01 +01:00
9f8d04ab9a
Fix passing variable down to evaluate context
2021-06-16 11:39:04 +01:00
40d384d9f9
Merge pull request #6200 from matrix-org/gsouquet/fix-17632
2021-06-16 10:21:02 +01:00
069e2e13cf
Migrate MessageTimestamp to TypeScript
2021-06-16 10:01:30 +01:00
a5d608f2af
Keep composer reply when scrolling away from a highlighted event
2021-06-16 10:01:23 +01:00
3162d144e2
Merge pull request #6194 from matrix-org/dbkr/already_in_call
...
Cache virtual/native room mappings when they're created
2021-06-16 08:55:44 +01:00
1f15097e9d
Merge pull request #6191 from matrix-org/gsouquet/ci-disable-perf-comments
...
Disable comment-on-alert
2021-06-16 08:50:38 +01:00
7e434d8844
Merge pull request #6195 from matrix-org/dependabot/npm_and_yarn/postcss-7.0.36
...
Bump postcss from 7.0.35 to 7.0.36
2021-06-15 17:25:50 -06:00
d13611736a
Update MSC number references for voice messages
...
as per https://github.com/matrix-org/matrix-doc/pull/3245
2021-06-15 17:24:56 -06:00
Šimon Brandner