Commit Graph

41 Commits

Author SHA1 Message Date
ismailgulek ec0f204f08 Merge branch 'master' into develop 2022-07-05 10:26:51 +03:00
aringenbach 48fefde091 Display fallback when replied event content is partially missing 2022-07-04 16:59:26 +02:00
Gil Eluard 260cc22d51 Update Files component iOS (#6345)
* Update Files component iOS

- Done
2022-06-29 16:11:52 +02:00
Johannes Marbach c4d386c819 Enable reporting of live location shares
Signed-off-by: Johannes Marbach <johannesm@element.io>
2022-06-21 15:17:41 +02:00
aringenbach cc2a95e865 Use latest user data for mention pills 2022-06-16 17:07:47 +02:00
aringenbach 5fff2bb1b1 Set HTML formatter as static 2022-06-16 09:07:02 +02:00
aringenbach dfc5146658 Move font parameter and update parameters description 2022-06-16 09:07:02 +02:00
aringenbach 1c2fc49817 Improve HTML formatter 2022-06-16 09:07:02 +02:00
aringenbach 2920a463f0 Fix reply to usernames containing HTML escape characters 2022-06-10 17:31:34 +02:00
aringenbach 1538153259 Remove old comment 2022-06-08 08:54:29 +02:00
aringenbach bcc7bd3505 Remove render edit flag and fix a nil room state crash 2022-06-07 17:31:17 +02:00
aringenbach 12bcd06caf Merge pull request #6155 from vector-im/aringenbach/construct_replies_from_replied_event
Construct formatted body from replied event
2022-06-07 11:23:50 +02:00
aringenbach 0e723d0d62 Fix in reply to links appearing outside of mx-quote 2022-06-07 09:02:36 +02:00
aringenbach 74389edddd Fix else opening bracket
Co-authored-by: Gil Eluard <gile@element.io>
2022-06-03 12:08:16 +02:00
aringenbach 008728711b Create reply body only if replied event sender is available 2022-06-03 09:14:06 +02:00
aringenbach 77e9a6364c Construct formatted body from replied event 2022-06-02 15:45:08 +02:00
aringenbach d5fdb60eab Fix fonts and edition on replies 2022-05-04 12:17:21 +02:00
ismailgulek 9511a40d84 fix missing MXJSONModel setters 2022-03-17 15:31:15 +03:00
ismailgulek bd24d0bd29 Update Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m
Co-authored-by: Gil Eluard <gile@element.io>
2022-03-17 15:27:29 +03:00
ismailgulek ee65744103 Update Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m
Co-authored-by: Gil Eluard <gile@element.io>
2022-03-17 15:27:22 +03:00
ismailgulek 0625ac373d Update Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m
Co-authored-by: Gil Eluard <gile@element.io>
2022-03-17 15:27:14 +03:00
ismailgulek bbe2d87c71 Update Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m
Co-authored-by: Gil Eluard <gile@element.io>
2022-03-17 15:27:05 +03:00
ismailgulek b210582b01 Use event's new content when available 2022-03-17 14:24:02 +03:00
ismailgulek dcc7a48664 Fix tests 2022-03-15 13:55:44 +03:00
ismailgulek ed7f1a6863 Extend reply fallback for also non-thread events 2022-03-14 13:44:13 +03:00
Doug 2aec883095 Remove MatrixKitL10n from SwiftGen
Uses VectorL10n everywhere.
2022-03-03 09:34:54 +00:00
ismailgulek f5fd6d2d0f Change font for message body if required 2022-03-01 16:48:33 +03:00
ismailgulek 4af52ebb10 Add string parameter to fontForEvent method 2022-03-01 16:43:23 +03:00
ismailgulek 568f1185c8 Fix text color and font for regular reply events 2022-02-22 15:06:45 +03:00
MaximeE 8a7fb883f1 Replace kick by remove in all strings 2022-02-11 14:25:20 +01:00
ismailgulek c1ea79c0d2 Display redacted events only if threads enabled 2022-01-28 04:31:44 +03:00
ismailgulek c8e4eef91d Use replied event in fallback events 2022-01-28 04:31:19 +03:00
ismailgulek e344dcceed Merge branch 'develop' into ismail/5068_start_thread 2022-01-19 00:07:52 +03:00
Stefan Ceriu 67e7db38c2 vector-im/element-ios/issues/5114 - Allow editing poll start events. 2022-01-18 20:05:10 +02:00
ismailgulek 7a74dc422f Merge branch 'develop' into ismail/5068_start_thread 2022-01-17 11:35:10 +03:00
Stefan Ceriu fc56a7c267 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 3f715ec2c4 vector-im/element-ios/issues/5298 - Replaced "msgtype" strings with new kMXMessageTypeKey. 2022-01-04 17:33:32 +02:00
Stefan Ceriu ca2493f09d Rendering location messages in the timeline. 2022-01-04 17:33:32 +02:00
ismailgulek 924d1d0e30 Apply MatrixKit PR changes 2021-12-09 16:57:43 +03:00
Stefan Ceriu dc574ab0a6 vector-im/element-ios/issues/5114 - Polls in the timeline. 2021-12-09 09:37:02 +02:00
SBiOSoftWhare 1d9f01b5e3 Merge MatrixKit develop with commit hash: b85b736313bec0592bd1cabc68035d97f5331137 2021-12-03 11:47:24 +01:00