Commit Graph

7 Commits

Author SHA1 Message Date
Nicolas Werner de7ec4d2b3 Merge remote-tracking branch 'origin/master' into new-event-store
Conflicts:
	CMakeLists.txt
	io.github.NhekoReborn.Nheko.json
	src/Cache.cpp
	src/timeline/TimelineModel.cpp
	src/timeline/TimelineModel.h
	src/timeline/TimelineViewManager.cpp
2020-08-17 20:40:33 +02:00
trilene aec24efbe2 Specify call type on timeline 2020-07-24 13:30:12 -04:00
Nicolas Werner 19f27236ea Fix reactions 2020-07-20 00:42:48 +02:00
Nicolas Werner 9eddcfc42f Remove some redundant functions 2020-05-30 16:38:11 +02:00
Nicolas Werner 0fc98b2692 Experimental blurhash implementation (MXC2448) 2020-03-03 02:34:26 +01:00
Nicolas Werner ec9da9f42a Try to fix flickering, if sync return event before send completes 2020-02-16 00:20:41 +01:00
Nicolas Werner e084543cc0 Move visitors out of TimelineModel 2019-12-27 21:50:37 +01:00