6 commits

Author	SHA1	Message	Date
Joseph Donofry	6bb73f84a3	Merge master and fix conflicts	2020-06-09 20:51:36 -04:00
Joseph Donofry	fa34749279	Minor adjustments to emoji picker	2020-06-09 20:47:21 -04:00
Joseph Donofry	5228861b88	Add reaction/redaction for in-line Reactions	2020-05-21 21:21:35 -04:00
Joseph Donofry	f4ea0b215d	Attach emoji picker picked to reaction sender	2020-05-16 15:52:51 -04:00
Joseph Donofry	ff7468e6d5	Update emoji picker and translations	2020-05-13 20:19:15 -04:00
Joseph Donofry	ee4dcef90f	Add new QML-based emoji picker (work in progress) ... This is necessary to support having a picker within QML. Eventually, this should replace the existing widget-based one.	2020-05-13 00:36:41 -04:00