9 commits

Author	SHA1	Message	Date
Joseph Donofry	6bb73f84a3	Merge master and fix conflicts	2020-06-09 20:51:36 -04:00
Nicolas Werner	f452bdf2b0	Make settings update immediately in qml and allow limiting timeline width ... Limiting improves readability on wide monitors. The immediate update of the settings is done by just exposing settings as properties and then setting the settings as a context property.	2020-05-26 22:54:51 +02:00
Joseph Donofry	5228861b88	Add reaction/redaction for in-line Reactions	2020-05-21 21:21:35 -04:00
Nicolas Werner	a75d7f00bc	Fix reactions binding loop	2020-05-16 22:19:37 +02:00
Nicolas Werner	a1951056da	Reaction and Button layout fixes	2020-05-06 03:40:24 +02:00
Nicolas Werner	e55a09906f	Misc color fixes	2020-05-05 23:43:43 +02:00
Nicolas Werner	846ff33ed8	Position reaction emoji and text on the same baseline	2020-05-04 13:41:18 +02:00
Nicolas Werner	54013e4a00	Basic, broken reaction display	2020-05-04 13:14:54 +02:00
Nicolas Werner	a9aed09d35	Add placeholder for reactions	2020-05-04 00:59:05 +02:00