Commit graph

9 commits

Author SHA1 Message Date
Travis Ralston
fde32f13a5 [CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop 2020-01-09 14:15:09 -07:00
Travis Ralston
d56f0f2a25 Convert many imports to handle ES6 exports
Reliant upon https://github.com/matrix-org/matrix-react-sdk/pull/3761
2019-12-22 21:04:42 -07:00
Michael Telatynski
d35b01b63a Get rid of stripped-emoji.json in favour of an in-memory single truth source 2019-12-18 15:40:19 +00:00
J. Ryan Stinnett
3d1a1121b9 Restore thumbs after variation selector removal
This more thorough change adjusts emoji processing to deal with variation
selectors appropriately and revives the missing thumbs.

Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/3598
Fixes https://github.com/vector-im/riot-web/issues/11344
2019-11-07 17:49:25 +00:00
J. Ryan Stinnett
91f3b75d41 Remove variation selectors from quick reactions
This fixes a regression introduced by the full emoji picker which inserted empty
variation selectors in the thumbs up / down quick reactions. Since this makes
them different characters, it would cause us to not aggregate thumbs from web
vs. mobile together.

Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/3554
Fixes https://github.com/vector-im/riot-web/issues/11335
2019-11-07 10:19:35 +00:00
Michael Telatynski
93ecc9839b Fix linty failures 2019-10-22 13:49:02 +01:00
Tulir Asokan
10732e8e73 Fix license headers
Signed-off-by: Tulir Asokan <tulir@maunium.net>
2019-10-20 12:31:21 +03:00
Tulir Asokan
318754d31c Reorganize reaction sending and show if emoji is selected
Signed-off-by: Tulir Asokan <tulir@maunium.net>
2019-10-15 19:07:04 +03:00
Tulir Asokan
497b779334 Add full emoji picker for reactions
Signed-off-by: Tulir Asokan <tulir@maunium.net>
2019-10-14 00:32:11 +03:00