PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
15616 commits 1 branch 0 tags 338 MiB
Commit graph

15616 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Karol Kosek
e4d5f95785 Translated using Weblate (Polish) 
Currently translated at 73.5% (1199 of 1632 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2019-05-20 08:42:47 +00:00
Edgars Voroboks
7e5d51db6f Translated using Weblate (Latvian) 
Currently translated at 57.1% (932 of 1632 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lv/
 2019-05-20 08:42:46 +00:00
Szimszon
8d583f49cc Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1632 of 1632 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2019-05-20 08:42:45 +00:00
Kévin C
f7968596e9 Translated using Weblate (French) 
Currently translated at 99.9% (1630 of 1632 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-05-20 08:42:45 +00:00
Bruno Windels
1368a5eb80
Merge pull request #2996 from matrix-org/bwindels/composerdesign 
Message editing: apply design
 2019-05-20 08:42:41 +00:00
Bruno Windels
a47e722fa1 same height as normal pill 2019-05-20 10:28:26 +02:00
Bruno Windels
3b598a1782 set pill avatar through css variables to set on psuedo-element 
this way it won't interfere with editor selection/caret
 2019-05-20 10:28:26 +02:00
Bruno Windels
710338c01f pass member and room to editor pills to get avatar url 2019-05-20 10:28:26 +02:00
Bruno Windels
0c0052d06e re-apply formatting when editor is closed 2019-05-20 10:19:29 +02:00
Matthew Hodgson
b0ec594c5a comment on the futility of stripped-emoji.json 2019-05-19 21:19:20 +01:00
Matthew Hodgson
81338306b0 fix lint 2019-05-19 21:00:14 +01:00
Matthew Hodgson
64e2de5b47 make autocomplete work again 2019-05-19 20:56:07 +01:00
Matthew Hodgson
dbc6815abf make EmojiProvider and stripped-emoji.json work 2019-05-19 20:48:18 +01:00
Matthew Hodgson
497be91c4d combine regexps correctly 2019-05-19 17:53:36 +01:00
Matthew Hodgson
e48cc44cba apply monospace font correctly 2019-05-19 17:41:18 +01:00
Matthew Hodgson
069a5a9546 remove obsolete emojione css 2019-05-19 17:11:41 +01:00
Matthew Hodgson
9f70bf3aec fix bigemoji 2019-05-19 17:06:21 +01:00
Matthew Hodgson
24b03374ac moar lineheight needed for big twemoji 2019-05-19 16:48:29 +01:00
Matthew Hodgson
54cea146e8 fix ugly formatting 2019-05-19 16:48:15 +01:00
Matthew Hodgson
c63419f8a2 typos 2019-05-19 16:31:25 +01:00
Matthew Hodgson
a8297a7698 fix build 2019-05-19 16:11:12 +01:00
Matthew Hodgson
dc72641264 replace emojione with twemoji. completely untested & debugged & unoptimised 2019-05-19 15:23:43 +01:00
Weblate
07a925c47f Merge branch 'origin/develop' into Weblate. 2019-05-18 18:38:06 +00:00
Filip Š
3c5ff566c5 Translated using Weblate (Slovenian) 
Currently translated at 0.7% (12 of 1631 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sl/
 2019-05-18 18:38:06 +00:00
Karol Kosek
8bb9544b12 Translated using Weblate (Polish) 
Currently translated at 70.9% (1157 of 1631 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2019-05-18 18:38:05 +00:00
Szimszon
074630acf3 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1631 of 1631 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2019-05-18 18:38:03 +00:00
Kévin C
fa3e2f0e52 Translated using Weblate (French) 
Currently translated at 99.9% (1629 of 1631 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-05-18 18:38:03 +00:00
Tuomas Hietala
bad372a13f Translated using Weblate (Finnish) 
Currently translated at 99.2% (1618 of 1631 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2019-05-18 18:38:03 +00:00