Šimon Brandner
e5188a5258
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
2021-06-12 13:32:49 +02:00
Šimon Brandner
6592839ed6
Simplifie some naming
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 12:44:12 +02:00
Šimon Brandner
d62f959014
Fix imports
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 12:30:56 +02:00
Šimon Brandner
ed148de567
Derive mute state from props
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 12:16:52 +02:00
Šimon Brandner
0c55a6c5bf
Add presenting text
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 11:50:16 +02:00
Šimon Brandner
176fb9baae
Don't show sidebar in PiP
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 11:03:14 +02:00
Šimon Brandner
e431f41e11
Fix feeds misbehaving
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 10:48:32 +02:00
Šimon Brandner
84070bf0ca
Rework how feeds work
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 09:19:58 +02:00
Šimon Brandner
1b2b4714e1
Properly handle feed prop updates
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 09:19:45 +02:00
Šimon Brandner
97b976b171
Adjust for sidebar
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 08:15:26 +02:00
Šimon Brandner
5608e92885
Add styling for CallViewSidebar
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 08:09:51 +02:00
Šimon Brandner
619231883f
Add CallViewSidebar
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 08:09:16 +02:00
Germain
015890477d
Merge pull request #6176 from matrix-org/gsouquet/deprecate-dependencies
2021-06-11 12:43:51 +01:00
Germain Souquet
37484e3fc4
Add TextEncoder polyfill for test run
2021-06-11 12:33:02 +01:00
Germain Souquet
84679cf8ec
remove legacy polyfills and unused dependencies
2021-06-11 12:19:14 +01:00
Germain
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
Šimon Brandner
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
Germain
88e337b89c
Merge pull request #5929 from matrix-org/gsouquet-e2ee-warning
2021-06-10 14:58:31 +01:00
Germain
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
Germain
79b8fbc2a9
Add indentation for unencrypted warning text
...
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2021-06-10 14:21:48 +01:00
Germain
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
Germain Souquet
9731e275f8
cater for an undefined MatrixClient on rooms
2021-06-10 12:15:55 +01:00
Germain Souquet
6606a1142d
Update unencrypted room warning copy
2021-06-10 11:29:10 +01:00
Germain Souquet
0e2e327c46
Delete new room intro stale CSS
2021-06-10 11:19:25 +01:00
Germain Souquet
7f3173f170
Implement unencrypted warning slate in rooms
2021-06-10 11:14:43 +01:00
Germain Souquet
4f649f290c
Migrate RoomSettingsDialog to TypeScript
2021-06-10 10:46:54 +01:00
Germain Souquet
c2d1eb3e8e
Merge branch 'develop' into gsouquet-e2ee-warning
2021-06-10 10:25:20 +01:00
Germain
4660101944
Merge pull request #6165 from matrix-org/gsouquet/react-17
2021-06-10 10:13:18 +01:00
Germain Souquet
b4cb275ca1
Fix expanding last collapsed sticky session when zoomed in
2021-06-09 17:59:41 +01:00
Germain
91a88f25a8
Merge pull request #6168 from matrix-org/gsouquet/fix-17586
...
Revert refreshStickyHeaders optimisations
2021-06-09 16:34:11 +01:00
David Baker
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
J. Ryan Stinnett
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
David Baker
bd8fd246c6
Add logging for which rooms calls are in
2021-06-09 16:04:03 +01:00
J. Ryan Stinnett
c6972c4535
Fix spelling
2021-06-09 15:53:38 +01:00
J. Ryan Stinnett
e566704bdf
Remove redundant early return
2021-06-09 15:48:30 +01:00
J. Ryan Stinnett
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
Germain Souquet
927de02a8e
Revert refreshStickyHeaders optimisations
2021-06-09 14:59:55 +01:00
Germain
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
Germain
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
Germain Souquet
ceed6ecbe8
Restore Page Up/Down key bindings when focusing the composer
2021-06-09 14:03:31 +01:00
Germain Souquet
15132074e2
Restore copy button icon when sharing permalink
2021-06-09 13:44:31 +01:00
Germain Souquet
4e14c612b7
Remove extraenous instructions
2021-06-09 12:17:49 +01:00
Germain Souquet
90cc26c78f
rename workflow
2021-06-09 12:17:12 +01:00
Germain Souquet
6e0a908c59
Merge branch 'develop' into gsouquet/react-17
2021-06-09 12:01:35 +01:00
Germain Souquet
d492ee4d8a
Update Enzyme adapter name
2021-06-09 11:57:29 +01:00
Germain Souquet
85d1bb65c6
Upgrade to React@17
2021-06-09 11:40:20 +01:00
Germain
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
Germain
8334a2ba60
Merge pull request #6143 from robintown/hide-events-perf
2021-06-09 09:13:56 +01:00
Robin Townsend
a28f5754c7
Convert TextForEvent to TypeScript
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-08 21:58:48 -04:00
Travis Ralston
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