15 Commits

Author	SHA1	Message	Date
ismailgulek	b2c34fe37c	Display redacted events only if threads enabled	2022-01-28 04:31:44 +03:00
ismailgulek	cf3f7e62a7	Use replied event in fallback events	2022-01-28 04:31:19 +03:00
ismailgulek	701d38c798	Merge branch 'develop' into ismail/5068_start_thread	2022-01-19 00:07:52 +03:00
Stefan Ceriu	0980804213	vector-im/element-ios/issues/5114 - Allow editing poll start events.	2022-01-18 20:05:10 +02:00
ismailgulek	a314deb7a1	Merge branch 'develop' into ismail/5068_start_thread	2022-01-17 11:35:10 +03:00
Stefan Ceriu	7826faf6ea	vector-im/element-ios/issues/5298 - Added body message content keys and replaced plain string usages.	2022-01-04 17:33:32 +02:00
Stefan Ceriu	9c66b5b7b1	vector-im/element-ios/issues/5298 - Replaced "msgtype" strings with new kMXMessageTypeKey.	2022-01-04 17:33:32 +02:00
Stefan Ceriu	c1a3fede8f	Rendering location messages in the timeline.	2022-01-04 17:33:32 +02:00
ismailgulek	ac1b79ff92	Merge branch 'develop' into ismail/5068_start_thread	2022-01-04 15:28:19 +03:00
Doug	70e0eed440	Move string formatting to Tools. ... Revert contacts tracking from MatrixKit. Final tweaks before PR.	2021-12-16 17:01:22 +00:00
Doug	d2785df5ba	Migrate doug/5035_posthog from MatrixKit.	2021-12-16 17:01:22 +00:00
ismailgulek	061f62251b	Apply MatrixKit PR changes	2021-12-09 16:57:43 +03:00
Stefan Ceriu	ac6561a3d3	vector-im/element-ios/issues/5114 - Polls in the timeline.	2021-12-09 09:37:02 +02:00
SBiOSoftWhare	e7d4cd7707	Merge MatrixKit develop with commit hash: b85b736313bec0592bd1cabc68035d97f5331137	2021-12-03 11:47:24 +01:00
SBiOSoftWhare	f0303a6475	Update MXKSwiftHeader.h for new MatrixKit location.	2021-11-30 17:25:43 +01:00