Travis Ralston
e4aeabe5a6
Merge pull request #4444 from pv/jitsi-popout-immediate-join
...
Ensure active Jitsi conference is closed on widget pop-out
2020-06-07 20:22:39 -06:00
Travis Ralston
19a7297a77
Merge pull request #4720 from matrix-org/travis/room-list/sticky
...
Introduce sticky rooms to the new room list
2020-06-07 19:05:07 -06:00
Travis Ralston
760333a0ae
Move function to a private function
2020-06-07 13:08:25 -06:00
Travis Ralston
a7fe7cb28d
Merge remote-tracking branch 'origin/develop' into travis/room-list/sticky
2020-06-07 13:06:30 -06:00
Travis Ralston
736151027f
Merge pull request #4721 from matrix-org/travis/room-list/edge-cases
...
Handle remaining cases for room updates in new room list
2020-06-07 13:05:50 -06:00
Travis Ralston
9b928b5a5d
Handle remaining cases for room updates in new room list
...
For https://github.com/vector-im/riot-web/issues/13635
This adds support for:
* Tag changes
* DM changes
* Marking our own rooms as read
* Our own membership changes
The remaining branch we didn't need was the alternate 'new room' branch, so it was removed.
This is not optimized - optimization is deferred.
2020-06-05 20:12:32 -06:00
Travis Ralston
0bb1eefdea
Remove view_room listener as it isn't needed
...
We use the RoomViewStore
2020-06-05 19:47:15 -06:00
Travis Ralston
6548748d7c
Introduce sticky rooms to the new room list
...
Originally this was intended to be done only in the importance algorithm, however it is clear that all algorithms will need to deal with this. As such, it has been put into the base class to deal with as we may override it in the future.
This commit should be self-documenting enough to describe what is going on, though the major highlight is that the handling of the sticky room is done by lying to the underlying algorithm.
This has not been optimized for performance yet.
For https://github.com/vector-im/riot-web/issues/13635
2020-06-05 18:44:38 -06:00
Michael Telatynski
e809f280f5
Merge pull request #4719 from matrix-org/t3chguy/emoji-ligatures
...
Allow searching the emoji picker using other emoji
2020-06-05 23:54:21 +01:00
Michael Telatynski
0c32daa162
label ZWJ as such
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-05 23:34:04 +01:00
Michael Telatynski
69ea635398
Allow searching the emoji picker using other emoji
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-05 23:19:00 +01:00
Travis Ralston
ee3d2c51d8
Merge pull request #4697 from matrix-org/travis/room-list/scrolling-resize
...
New room list scrolling and resizing
2020-06-05 13:17:59 -06:00
Travis Ralston
e93a41c5fb
Minor clarity
2020-06-05 13:14:44 -06:00
Travis Ralston
68e59a3655
Merge pull request #4696 from aaronraimist/empty-formatbar
...
Don't show FormatBar if composer is empty
2020-06-05 11:27:00 -06:00
Travis Ralston
51038b0c02
Replace math hacks with temporary placeholder
2020-06-05 11:03:18 -06:00
Travis Ralston
efa12b8c2f
Merge pull request #4687 from matrix-org/travis/split-left-panel
...
Split the left panel into new and old for new room list designs
2020-06-05 10:07:13 -06:00
RiotRobot
d54308a8c6
Reset matrix-js-sdk back to develop branch
2020-06-05 15:48:06 +01:00
RiotRobot
1d6141cf73
Merge branch 'master' into develop
2020-06-05 15:47:23 +01:00
RiotRobot
c8366b7a47
v2.7.1
2020-06-05 15:43:24 +01:00
RiotRobot
94059b8524
Prepare changelog for v2.7.1
2020-06-05 15:43:23 +01:00
RiotRobot
68623b43b1
Merge branch 'release-v2.7.1' of github.com:matrix-org/matrix-react-sdk into release-v2.7.1
2020-06-05 15:35:34 +01:00
Michael Telatynski
b49d437ee8
Merge pull request #4716 from matrix-org/t3chguy/1.6.4/r3
...
Fix exceptions from Tooltip
2020-06-05 15:33:50 +01:00
David Baker
93ed062900
Fix exceptions from Tooltip
...
renderTooltip was not a bound function and so was failing to find
the parent when called from the 'scroll' event listener because
'this' was the window object rather than the Tooltip object.
Unsure at what point this broke - I assumed it was in thr recent
typescript conversion but it looks like it would have had the same
problem before.
(cherry picked from commit 5e569d75b6
2020-06-05 15:20:49 +01:00
RiotRobot
e78fa602c0
Upgrade matrix-js-sdk to 6.2.1
2020-06-05 15:13:55 +01:00
Michael Telatynski
455b915143
Merge pull request #4715 from matrix-org/t3chguy/1.6.4/r2
...
Fix not being able to dismiss new login toasts
2020-06-05 11:34:06 +01:00
Michael Telatynski
04e6112dfb
Merge pull request #4714 from matrix-org/t3chguy/1.6.4/r1
...
Fix compact layout regression
2020-06-05 11:31:42 +01:00
Travis Ralston
ab9284fced
Fix not being able to dismiss new login toasts
...
`toastKey` is a thing.
Fixes https://github.com/vector-im/riot-web/issues/13923
(cherry picked from commit c667ea69af
2020-06-05 11:24:22 +01:00
Michael Telatynski
0dc788eaa7
Fix compact layout regression
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
(cherry picked from commit f4f23dba04
2020-06-05 11:22:33 +01:00
Michael Telatynski
f221e06068
Merge pull request #4712 from matrix-org/t3chguy/compact-mode
...
Fix compact layout regression
2020-06-05 11:02:59 +01:00
Michael Telatynski
f4f23dba04
Fix compact layout regression
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-05 10:53:00 +01:00
Travis Ralston
1f11298aa3
Annotate hacky math
2020-06-04 21:45:32 -06:00
Travis Ralston
e90e70bd77
Misc cleanup
2020-06-04 21:43:33 -06:00
Travis Ralston
0694637b06
Remove debug
2020-06-04 21:38:06 -06:00
Travis Ralston
f347019cf8
Remove obviously questionable color choices
2020-06-04 21:37:10 -06:00
Travis Ralston
434f6ea4d4
Remove legacy sublist sizing
2020-06-04 16:36:14 -06:00
Travis Ralston
dc01607ad9
Merge branch 'develop' into travis/split-left-panel
2020-06-04 15:09:51 -06:00
Matthew Hodgson
02cdc8a201
Merge pull request #4710 from matrix-org/matthew/fix-safari-emoji
...
fix emoji in safari
2020-06-04 22:07:18 +01:00
Matthew Hodgson
c171bdfec7
fix emoji in safari
...
1. emoji sometimes vanished from the autocompleter due to a rounding error
combined with maxWidth: 1em on the emoji span kicking in at arbitrary
font sizes/zooms
2. apparently safari needs explicit VS-16 ligatures, as per
ff7dec427f
2020-06-04 22:01:16 +01:00
Travis Ralston
3fff46b0c7
Merge pull request #4709 from matrix-org/travis/later
...
Fix not being able to dismiss new login toasts
2020-06-04 14:12:21 -06:00
Travis Ralston
dc23dd637c
Revert "Add a warning for dismissing invalid toasts"
...
This reverts commit 3674b6446e
2020-06-04 14:07:06 -06:00
Travis Ralston
3674b6446e
Add a warning for dismissing invalid toasts
2020-06-04 13:53:09 -06:00
Travis Ralston
c667ea69af
Fix not being able to dismiss new login toasts
...
`toastKey` is a thing.
Fixes https://github.com/vector-im/riot-web/issues/13923
2020-06-04 13:48:35 -06:00
David Baker
ddc9c67a8b
Merge pull request #4708 from matrix-org/dbkr/bind_tooltip_render
...
Fix exceptions from Tooltip
2020-06-04 19:29:56 +01:00
David Baker
5e569d75b6
Fix exceptions from Tooltip
...
renderTooltip was not a bound function and so was failing to find
the parent when called from the 'scroll' event listener because
'this' was the window object rather than the Tooltip object.
Unsure at what point this broke - I assumed it was in thr recent
typescript conversion but it looks like it would have had the same
problem before.
2020-06-04 17:54:18 +01:00
Michael Telatynski
88c325afa4
Merge pull request #4707 from tulir/patch-1
...
Stop removing variation selector from quick reactions
2020-06-04 17:41:15 +01:00
Travis Ralston
2fe56276f2
css for vis
2020-06-04 10:07:41 -06:00
Tulir Asokan
46b282142f
Stop removing variation selector from quick reactions
...
Fixes vector-im/riot-web#13926
Signed-off-by: Tulir Asokan <tulir@maunium.net>
2020-06-04 18:58:13 +03:00
Travis Ralston
a3fdd643d7
Add hacky math support
2020-06-04 09:57:16 -06:00
Travis Ralston
cdf2d70aea
Merge branch 'develop' into travis/room-list/scrolling-resize
2020-06-04 09:19:54 -06:00
Travis Ralston
83df79aab9
Try variable resizing
2020-06-04 09:19:03 -06:00
