J. Ryan Stinnett
238e967470
Only show reactions in main message timeline
...
This fixes an error that crashed that notifications panel because it was trying
to read reactions, even though we currently don't aggregate them there. This
change is more explicit about exactly which views should try to show reactions.
Fixes https://github.com/vector-im/riot-web/issues/9713
2019-05-21 18:27:10 +01:00
Weblate
aa30e9cee3
Merge branch 'origin/develop' into Weblate.
2019-05-21 15:52:30 +00:00
Travis Ralston
907c7ed119
Merge pull request #2994 from matrix-org/travis/screenreader/topleftmenu
...
Update TopLeftMenu for accessibility: Keyboard shortcut, reduced screen reader noise
2019-05-21 09:52:26 -06:00
Weblate
5469a92b66
Merge branch 'origin/develop' into Weblate.
2019-05-21 15:39:14 +00:00
J. Ryan Stinnett
b4ca586431
Fix lint errors in NotificationPanel
2019-05-21 16:38:48 +01:00
Travis Ralston
bf28993509
appease the js-doc linter
...
hopefully
2019-05-21 09:33:52 -06:00
Bruno Windels
1a5bcb4908
don't need this as we prevent unneeded updates in shouldComponentUpdate
2019-05-21 16:56:26 +02:00
Bruno Windels
72c1725f98
this is already done as part of _applyFormatting
2019-05-21 16:56:05 +02:00
Weblate
f0056e54b7
Merge branch 'origin/develop' into Weblate.
2019-05-21 14:41:55 +00:00
J. Ryan Stinnett
2e052c925c
Merge pull request #3003 from matrix-org/jryans/hide-fallback-emoji
...
Remove reacted with text when shortcode missing
2019-05-21 15:41:50 +01:00
Weblate
5a30ac4af2
Merge branch 'origin/develop' into Weblate.
2019-05-21 14:33:44 +00:00
Bruno Windels
ef4fe52d6b
Merge pull request #3002 from matrix-org/bwindels/pill-avatar-fixup
...
Fixup: also change editor margin when last event and buttons are not overlaying
2019-05-21 14:33:39 +00:00
J. Ryan Stinnett
18d444d2e7
Remove reacted with text when shortcode missing
...
If we don't have the shortcode for some emoji, don't show any "reacted with X"
text in the reaction tooltip.
Fixes https://github.com/vector-im/riot-web/issues/9786
2019-05-21 15:08:11 +01:00
Bruno Windels
30d374dff4
also changing margin when last event and buttons are not overlaying
2019-05-21 16:06:14 +02:00
Weblate
571e8da651
Merge branch 'origin/develop' into Weblate.
2019-05-21 12:11:11 +00:00
Bruno Windels
2d4d608ed6
Merge pull request #2997 from matrix-org/bwindels/pill-avatars
...
Message editing: render avatars for pills in the editor
2019-05-21 12:11:06 +00:00
Bruno Windels
e48e72c162
pr feedback
2019-05-21 13:50:27 +02:00
Bruno Windels
fb03b5b168
fix lint
2019-05-21 13:49:43 +02:00
Weblate
f2399887e5
Merge branch 'origin/develop' into Weblate.
2019-05-21 10:32:59 +00:00
Matthew Hodgson
30a485bddd
Merge pull request #2995 from matrix-org/matthew/twemoji
...
Replace emojione with twemoji + emojibase
2019-05-21 11:32:53 +01:00
Bruno Windels
a75c948e2e
don't cache DRP
2019-05-21 12:24:12 +02:00
Bruno Windels
7c03d71607
give continued events a little bit of top padding
...
this way, the background isn't clipped at the top
2019-05-21 12:20:58 +02:00
Bruno Windels
5d184b3f77
reuse mx_Pill styles for editor pills to avoid style duplication
...
the avatar style code is still different though,
as it's implemented differently
This also prevents updating the css variables when not needed,
which caused the avatar to flicker when updating the editor.
2019-05-21 12:19:35 +02:00
Bruno Windels
b00a38a1e5
apply mx_EventTile_content to editor, so it gets the same right margin
...
this way we don't have to include it in the magic number
2019-05-21 12:18:20 +02:00
Travis Ralston
aac87c4635
Move focusing to the context menu create call
2019-05-20 21:07:55 -06:00
Travis Ralston
52b0f285c6
Add some clarifying comments
2019-05-20 21:07:12 -06:00
Weblate
f76a55e572
Merge branch 'origin/develop' into Weblate.
2019-05-20 21:38:00 +00:00
Travis Ralston
bf2a47b4d5
Merge pull request #3000 from matrix-org/t3chguy/hide_file_panel_typing_notifs
...
Hide WhoIsTyping component if the MessagePanel is shaped e.g file grid
2019-05-20 15:37:56 -06:00
Weblate
03743997d2
Merge branch 'origin/develop' into Weblate.
2019-05-20 21:36:16 +00:00
Travis Ralston
7979934b6d
Merge pull request #2999 from matrix-org/t3chguy/copied_tooltip
...
Close copy tooltip in edge cases correctly
2019-05-20 15:36:12 -06:00
Michael Telatynski
868c99d140
Hide WhoIsTyping component if the MessagePanel is shaped e.g file grid
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-05-20 21:53:15 +01:00
Michael Telatynski
e2476acd0a
Close copy tooltip in edge cases correctly
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-05-20 21:44:05 +01:00
Matthew Hodgson
d3f06763b3
Merge branch 'develop' into matthew/twemoji
2019-05-20 16:38:44 +01:00
Weblate
45a03e7e0d
Merge branch 'origin/develop' into Weblate.
2019-05-20 15:33:31 +00:00
J. Ryan Stinnett
db73e641ea
Merge pull request #2998 from matrix-org/jryans/clamp-reaction-senders
...
Limit reaction sender tooltip to 6 people
2019-05-20 16:33:26 +01:00
J. Ryan Stinnett
1bc9badeac
Limit reaction sender tooltip to 6 people
...
This limits the number of senders shown in the reaction sender tooltip shown
when hovering a reaction to 6 people followed by "and N others" for the rest.
Fixes https://github.com/vector-im/riot-web/issues/9722
2019-05-20 16:02:10 +01:00
J. Ryan Stinnett
0e5f0f24cc
Extract MELS-style comma separated list to shared utility
...
This allows other UI components to use the same formatting for a long list.
2019-05-20 15:21:18 +01:00
Bruno Windels
2bacabc002
apply 34px margin the mx_EventTile_content also has
...
so width of editor stay the same as content
(unrelated to pills, really)
2019-05-20 16:01:31 +02:00
Bruno Windels
5d80c3a2a4
fallback to avatar bg color
2019-05-20 15:39:06 +02:00
Bruno Windels
01ef1dd20e
style room pills correctly
2019-05-20 15:38:59 +02:00
Bruno Windels
df4f380082
find room by alias in room pill
2019-05-20 15:34:15 +02:00
Bruno Windels
0e98b124ac
undo thinko of passing current room as pill room
2019-05-20 15:33:54 +02:00
Bruno Windels
230e53fe2f
move most of room avatar handling to Avatar, to reuse in editor pills
2019-05-20 15:33:26 +02:00
Bruno Windels
5edfd01cb2
remove unused _getInitialLetter
2019-05-20 14:49:59 +02:00
Bruno Windels
c1b2f3dce1
make user pill avatars work in editor
2019-05-20 14:21:25 +02:00
Bruno Windels
e58d844e5b
move getInitialLetter to Avatar so we can reuse it for editor pills
2019-05-20 14:20:36 +02:00
Matthew Hodgson
e764ba4890
remove accidental whitespace
2019-05-20 10:10:30 +01:00
Matthew Hodgson
7b2602f1c7
apply monospace to pre
2019-05-20 10:09:19 +01:00
Matthew Hodgson
e3d3b155d6
remove errant debug
2019-05-20 10:08:34 +01:00
Weblate
c777c18e0a
Merge branch 'origin/develop' into Weblate.
2019-05-20 08:42:48 +00:00