Commit Graph

113 Commits

Author SHA1 Message Date
ismailgulek a195f43b38 Merge pull request #6274 from vector-im/ismail/5502_ungroup_threads
Ungroup events containing thread roots
2022-06-14 11:18:23 +03:00
ismailgulek 70dfb74fc1 Avoid merging of bubbles if current timeline configuration does not allow 2022-06-13 17:56:01 +03:00
ismailgulek 426f7ecfbd Do not group events containing thread roots 2022-06-13 13:57:14 +03:00
aringenbach cede58d5d5 Merge pull request #6039 from vector-im/aringenbach/3526_user_pills
Add mention pills to timeline & composer
2022-05-12 11:05:22 +02:00
MaximeE edeade17d1 6103: Update beaconInfoSummary 2022-05-10 15:21:59 +02:00
aringenbach 42a5574d4f Move tools funcs 2022-05-09 15:55:24 +02:00
aringenbach a683045690 Merge branch 'develop' into aringenbach/3526_user_pills 2022-05-05 10:29:01 +02:00
aringenbach 72132def39 Merge branch 'develop' into aringenbach/3526_user_pills 2022-05-04 16:01:17 +02:00
aringenbach 0c813338e3 Set property for UTType & add missing iOS 15 availabilities 2022-05-04 15:58:42 +02:00
SBiOSoftWhare f6fe4d21e3 RoomBubbleCellData: Handle SDK typo. 2022-05-04 15:53:13 +02:00
MaximeE 4a0cd3f724 6071: Fix for renaming in SDK 2022-05-04 12:06:38 +02:00
aringenbach 019161bb4a Merge branch 'develop' into aringenbach/3526_user_pills 2022-05-02 13:46:40 +02:00
MaximeE 3cad7061f3 6077: Implement SDK for live sharing timeline cell 2022-04-27 16:21:42 +02:00
aringenbach 2a5c2b6938 Setup NSTextAttachmentViewProvider 2022-04-27 11:55:23 +02:00
MaximeEvrard42 35f0c7537e Merge pull request #6055 from vector-im/maximee/6029_lls_timeline_cell
[Location sharing] Live location cell in timeline
2022-04-26 15:58:09 +02:00
SBiOSoftWhare b913c8a691 Update Riot/Modules/Room/CellData/RoomBubbleCellData.m
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
2022-04-22 17:59:15 +02:00
SBiOSoftWhare 2bfe9e8eeb Update Riot/Modules/Room/CellData/RoomBubbleCellData.m
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
2022-04-22 17:57:54 +02:00
SBiOSoftWhare 0bf0af8e5a RoomBubbleCellData: Handle live location cell and beacon info summary. 2022-04-22 11:51:22 +02:00
MaximeE b1ad2419ad 6029: finalise configuration of live location cell 2022-04-21 17:29:32 +02:00
MaximeE 9a7d16b74e 6029: Live location sharing timeline cell 2022-04-21 07:48:22 +02:00
Arnaud Ringenbach 4eafe7fd9a Rename dataSource2 parameters and handle target profiles 2022-03-07 13:45:02 +01:00
SBiOSoftWhare 7dfff11b5f Timeline decorations: Refactor reaction class names. 2022-02-28 15:52:29 +01:00
Andy Uhnak 01ba286f76 Show DM/room start header for every user
Signed-off-by: Andy Uhnak <andyuhnak@gmail.com>
2022-02-25 14:24:06 +00:00
SBiOSoftWhare 13012c55d8 Rename RoomBubbleCellLayout to PlainRoomCellLayoutConstants. 2022-02-16 10:56:52 +01:00
SBiOSoftWhare 9c34d1e053 RoomBubbleCellData: Handle atttributed text message without vert space. 2022-02-09 16:27:30 +01:00
SBiOSoftWhare fc2b565435 RoomBubbleCellData: Fix quote for bubbles. 2022-02-08 11:17:06 +01:00
SBiOSoftWhare 370ab1c552 RoomBubbleCellData: Handle attributed text without vertical blank space. 2022-02-07 20:58:00 +01:00
ismailgulek 9448d653a4 Fix further review remarks 2022-01-27 02:16:30 +03:00
ismailgulek d79af0e26d Fix Doug's remarks 2022-01-26 15:58:37 +03:00
ismailgulek d71b9ed645 Merge branch 'ismail/5068_start_thread' into ismail/5068_design_tweaks 2022-01-26 14:27:25 +03:00
ismailgulek 6ac01ae245 Merge branch 'develop' into ismail/5068_start_thread 2022-01-25 14:30:52 +03:00
SBiOSoftWhare 535af1caf3 Merge pull request #5383 from vector-im/steve/5208_text_msg_layout
Message bubbles: Text message layout
2022-01-21 16:06:57 +01:00
ismailgulek 83948f113f Merge branch 'ismail/5068_start_thread' into ismail/5068_design_tweaks 2022-01-19 00:09:26 +03:00
ismailgulek 701d38c798 Merge branch 'develop' into ismail/5068_start_thread 2022-01-19 00:07:52 +03:00
ismailgulek 740cd65c95 Fix cell layout when thread root is a poll 2022-01-18 23:44:03 +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 96d853452b Add thread decoration views for search results, fix #5268 2022-01-18 14:46:22 +03:00
ismailgulek a314deb7a1 Merge branch 'develop' into ismail/5068_start_thread 2022-01-17 11:35:10 +03:00
SBiOSoftWhare 02453bbac1 RoomBubbleCellData: Handle event merge configuration. 2022-01-14 11:14:50 +01:00
Stefan Ceriu 2ef67f3ed2 vector-im/element-ios/issues/5298 - Displaying a modal when tapping on a location in the timeline. 2022-01-04 17:33:32 +02: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 c47672a07e Merge branch 'develop' into ismail/5068_start_thread 2021-12-16 14:00:03 +03:00
Stefan Ceriu 3de1a8525c vector-im/element-ios/issues/5114 - Prevent poll events from ever getting merged into other bubble data. 2021-12-10 15:55:17 +02:00
ismailgulek 3a6e7a19e2 Merge branch 'develop' into ismail/5068_start_thread 2021-12-09 15:25:14 +03:00
Stefan Ceriu ac6561a3d3 vector-im/element-ios/issues/5114 - Polls in the timeline. 2021-12-09 09:37:02 +02:00
SBiOSoftWhare e8d4af46d2 Update all Objective-C MatrixKit imports to handle new location. 2021-11-30 16:09:53 +01:00
ismailgulek 5dfb0fbbfe Merge branch 'develop' into ismail/5068_start_thread 2021-11-30 01:33:51 +03:00
SBiOSoftWhare 2709236dd5 Improve generated Swift header imports. 2021-11-25 23:11:53 +01:00