9731e275f8
cater for an undefined MatrixClient on rooms
2021-06-10 12:15:55 +01:00
6606a1142d
Update unencrypted room warning copy
2021-06-10 11:29:10 +01:00
0e2e327c46
Delete new room intro stale CSS
2021-06-10 11:19:25 +01:00
7f3173f170
Implement unencrypted warning slate in rooms
2021-06-10 11:14:43 +01:00
4f649f290c
Migrate RoomSettingsDialog to TypeScript
2021-06-10 10:46:54 +01:00
c2d1eb3e8e
Merge branch 'develop' into gsouquet-e2ee-warning
2021-06-10 10:25:20 +01:00
4660101944
Merge pull request #6165 from matrix-org/gsouquet/react-17
2021-06-10 10:13:18 +01:00
91a88f25a8
Merge pull request #6168 from matrix-org/gsouquet/fix-17586
...
Revert refreshStickyHeaders optimisations
2021-06-09 16:34:11 +01:00
0b90560b1a
Merge pull request #6170 from matrix-org/dbkr/call_room_logging
...
Add logging for which rooms calls are in
2021-06-09 16:24:12 +01:00
9aaf506ad5
Merge pull request #6169 from matrix-org/jryans/rebuild-the-sky
...
Restore read receipt animation from event to event
2021-06-09 16:16:17 +01:00
bd8fd246c6
Add logging for which rooms calls are in
2021-06-09 16:04:03 +01:00
c6972c4535
Fix spelling
2021-06-09 15:53:38 +01:00
e566704bdf
Remove redundant early return
2021-06-09 15:48:30 +01:00
b43315c6c1
Restore read receipt animation from event to event
...
This restores expected read receipt animation by always including the positioned
parent of read receipts. I imagine there's something smarter we could be doing,
but for now, at least least get back to expected behaviour.
Fixes https://github.com/vector-im/element-web/issues/17561
2021-06-09 15:46:10 +01:00
927de02a8e
Revert refreshStickyHeaders optimisations
2021-06-09 14:59:55 +01:00
66a953a678
Merge pull request #6166 from matrix-org/gsouquet/fix-17547
...
Restore copy button icon when sharing permalink
2021-06-09 14:14:04 +01:00
fcef43c122
Merge pull request #6167 from matrix-org/gsouquet/fix-17588
...
Restore Page Up/Down key bindings when focusing the composer
2021-06-09 14:13:16 +01:00
ceed6ecbe8
Restore Page Up/Down key bindings when focusing the composer
2021-06-09 14:03:31 +01:00
15132074e2
Restore copy button icon when sharing permalink
2021-06-09 13:44:31 +01:00
6e0a908c59
Merge branch 'develop' into gsouquet/react-17
2021-06-09 12:01:35 +01:00
d492ee4d8a
Update Enzyme adapter name
2021-06-09 11:57:29 +01:00
85d1bb65c6
Upgrade to React@17
2021-06-09 11:40:20 +01:00
8334a2ba60
Merge pull request #6143 from robintown/hide-events-perf
2021-06-09 09:13:56 +01:00
a28f5754c7
Convert TextForEvent to TypeScript
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-08 21:58:48 -04:00
624aed053a
Merge pull request #6164 from matrix-org/dependabot/npm_and_yarn/css-what-5.0.1
...
Bump css-what from 5.0.0 to 5.0.1
2021-06-08 14:13:25 -06:00
dbb8aa47dc
Bump css-what from 5.0.0 to 5.0.1
...
Bumps [css-what](https://github.com/fb55/css-what ) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/fb55/css-what/releases )
- [Commits](https://github.com/fb55/css-what/compare/v5.0.0...v5.0.1 )
---
updated-dependencies:
- dependency-name: css-what
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-06-08 20:08:39 +00:00
692200b9c5
Merge pull request #6145 from matrix-org/dependabot/npm_and_yarn/test/end-to-end-tests/ws-6.2.2
...
Bump ws from 6.2.1 to 6.2.2 in /test/end-to-end-tests
2021-06-08 14:08:24 -06:00
16ddf18e69
Merge pull request #6163 from matrix-org/dependabot/npm_and_yarn/trim-newlines-3.0.1
...
Bump trim-newlines from 3.0.0 to 3.0.1
2021-06-08 14:08:02 -06:00
7155c033f2
Bump trim-newlines from 3.0.0 to 3.0.1
...
Bumps [trim-newlines](https://github.com/sindresorhus/trim-newlines ) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/sindresorhus/trim-newlines/releases )
- [Commits](https://github.com/sindresorhus/trim-newlines/commits )
---
updated-dependencies:
- dependency-name: trim-newlines
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-06-08 19:20:10 +00:00
2938bfbadf
Merge pull request #6162 from matrix-org/t3chguy/fix/17596
...
Fix upgrade to element home button in top left menu
2021-06-08 17:48:45 +01:00
90982f9b3f
Fix upgrade to element home button in top left menu
2021-06-08 17:31:08 +01:00
34cc494a8e
Merge pull request #6140 from matrix-org/t3chguy/fix/17553
2021-06-08 16:45:35 +01:00
f84ee22769
Add comment
2021-06-08 16:36:53 +01:00
399be4fa5d
Merge pull request #6161 from matrix-org/dbkr/widget_load_error
...
Better handling for widgets that fail to load
2021-06-08 16:28:44 +01:00
90a58380fd
Make it translateable
...
And also the other one that I copied from
2021-06-08 16:15:20 +01:00
26a030abcd
Better handling for widgets that fail to load
2021-06-08 12:40:38 +01:00
432373a00e
Merge pull request #5999 from robintown/improved-forwarding-ui
2021-06-08 10:52:06 +01:00
826d56585e
Merge pull request #6118 from aaronraimist/share-room
2021-06-08 09:03:49 +01:00
372f24ff99
Hide download links from forward dialog preview
...
since trying to interact with them is pointless.
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-07 19:19:14 -04:00
b00ad63a35
Fix whitespace nitpick
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-07 19:16:00 -04:00
a8dab04d5e
Remove mystery dot from forward dialog preview
...
It was a bullet point, since EventTiles now get created as li by default
:P
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-07 19:10:45 -04:00
b97867271b
Merge branch 'develop' into improved-forwarding-ui
2021-06-07 19:09:36 -04:00
946416cf87
Make serverCandidates optional
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-06-07 17:09:56 -05:00
9fdbd4c120
Merge branch 'develop' into share-room
2021-06-07 17:00:44 -05:00
65cc42b555
Merge pull request #6160 from robintown/fix-setting-watchers
2021-06-07 22:56:39 +01:00
773af6c7be
Fix test
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-06-07 16:54:53 -05:00
a5bf17ff65
Revert incorrect change to forShareableRoom
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-06-07 16:54:41 -05:00
ced6c43147
Merge pull request #6152 from matrix-org/t3chguy/fix/17571
...
Fix Stickerpicker context menu
2021-06-07 22:21:19 +01:00
801b5f9c1a
Merge pull request #6155 from matrix-org/t3chguy/spacesteammatewarning
...
Add warning to private space creation flow
2021-06-07 22:21:07 +01:00
8ccdf9a3e8
Reset matrix-js-sdk back to develop branch
2021-06-07 17:43:27 +01:00
Germain Souquet