Commit graph

15 commits

Author SHA1 Message Date
ismailgulek
9d83aee4b7
Display redacted events only if threads enabled 2022-01-28 04:31:44 +03:00
ismailgulek
ad83173678
Use replied event in fallback events 2022-01-28 04:31:19 +03:00
ismailgulek
fe9eeeadd5
Merge branch 'develop' into ismail/5068_start_thread 2022-01-19 00:07:52 +03:00
Stefan Ceriu
a23bd0da99 vector-im/element-ios/issues/5114 - Allow editing poll start events. 2022-01-18 20:05:10 +02:00
ismailgulek
aeccbc0dac
Merge branch 'develop' into ismail/5068_start_thread 2022-01-17 11:35:10 +03:00
Stefan Ceriu
574a155c80 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
5a72750f8d vector-im/element-ios/issues/5298 - Replaced "msgtype" strings with new kMXMessageTypeKey. 2022-01-04 17:33:32 +02:00
Stefan Ceriu
01f53bd8d1 Rendering location messages in the timeline. 2022-01-04 17:33:32 +02:00
ismailgulek
ca36f99a08
Merge branch 'develop' into ismail/5068_start_thread 2022-01-04 15:28:19 +03:00
Doug
a2aa01f06c Move string formatting to Tools.
Revert contacts tracking from MatrixKit.
Final tweaks before PR.
2021-12-16 17:01:22 +00:00
Doug
9d4a1d96d6 Migrate doug/5035_posthog from MatrixKit. 2021-12-16 17:01:22 +00:00
ismailgulek
d7b18bb223
Apply MatrixKit PR changes 2021-12-09 16:57:43 +03:00
Stefan Ceriu
d5982e813b vector-im/element-ios/issues/5114 - Polls in the timeline. 2021-12-09 09:37:02 +02:00
SBiOSoftWhare
acd0d83c33 Merge MatrixKit develop with commit hash: b85b736313bec0592bd1cabc68035d97f5331137 2021-12-03 11:47:24 +01:00
SBiOSoftWhare
5c0bbc6800 Update MXKSwiftHeader.h for new MatrixKit location. 2021-11-30 17:25:43 +01:00