6b4f63df2a
Merge pull request #6184 from matrix-org/t3chguy/rs/5566
2021-06-14 23:27:51 +01:00
2fd8cc414c
Merge pull request #6111 from matrix-org/t3chguy/fix/17365
2021-06-14 22:57:14 +01:00
539465ecb4
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365
...
Conflicts:
src/components/views/dialogs/InviteDialog.tsx
2021-06-14 22:22:30 +01:00
430ec8cecd
Clear selected rooms after operation in manage space rooms
2021-06-14 22:18:18 +01:00
f8eea2ae23
Fix word wrap in space descriptions
2021-06-14 22:18:02 +01:00
91df392a2a
Merge pull request #5880 from SimonBrandner/show-username
2021-06-14 21:34:01 +01:00
d4c039a332
Merge pull request #6183 from matrix-org/travis/fix-types
...
Move various createRoom types to the js-sdk
2021-06-14 13:51:37 -06:00
951fbf4a1a
fix import
2021-06-14 13:38:43 -06:00
2eafe132b8
Move various createRoom types to the js-sdk
2021-06-14 13:31:58 -06:00
42538f8c75
Merge pull request #6175 from matrix-org/gsouquet/fix-17621
...
Fix HTML tag for Event Tile when not rendered in a list
2021-06-14 15:48:00 +01:00
e260e8671f
Inline display name into return
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-11 15:14:16 +02:00
015890477d
Merge pull request #6176 from matrix-org/gsouquet/deprecate-dependencies
2021-06-11 12:43:51 +01:00
37484e3fc4
Add TextEncoder polyfill for test run
2021-06-11 12:33:02 +01:00
84679cf8ec
remove legacy polyfills and unused dependencies
2021-06-11 12:19:14 +01:00
b1824ce579
fix HTML tag for Event Tile when not rendered in a list
2021-06-11 11:34:53 +01:00
e84d51bc0a
Merge pull request #6173 from SimonBrandner/fix/hover-select-event-tile/17576
...
Fix buggy hovering/selecting of event tiles
2021-06-11 09:30:32 +01:00
5343be7814
Fix buggy hovering/selecting of event tiles
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-10 18:53:56 +02:00
88e337b89c
Merge pull request #5929 from matrix-org/gsouquet-e2ee-warning
2021-06-10 14:58:31 +01:00
c6968b4919
Merge pull request #6156 from matrix-org/gsouquet/gh-actions-e2e-tests
...
Migrate end to end tests to GitHub actions
2021-06-10 14:41:46 +01:00
8174973cfe
Use the same styling as for mx_TextualEvent
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-10 15:31:27 +02:00
79b8fbc2a9
Add indentation for unencrypted warning text
...
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2021-06-10 14:21:48 +01:00
0a6cd6a758
Merge pull request #6171 from matrix-org/gsouquet/fix-17505
...
Fix expanding last collapsed sticky session when zoomed in
2021-06-10 12:44:57 +01:00
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
b4cb275ca1
Fix expanding last collapsed sticky session when zoomed in
2021-06-09 17:59:41 +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
4e14c612b7
Remove extraenous instructions
2021-06-09 12:17:49 +01:00
90cc26c78f
rename workflow
2021-06-09 12:17:12 +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
c9b1d1aef0
Only run e2e tests on develop and PR targetting develop
...
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2021-06-09 10:38:28 +01:00
8334a2ba60
Merge pull request #6143 from robintown/hide-events-perf
2021-06-09 09:13:56 +01:00
fccd71f82e
Update styling based on review
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-09 06:23:51 +02:00
Michael Telatynski