Commit Graph

1315 Commits

Author SHA1 Message Date
ismailgulek 76769cd64a Adapt MXEventTimeline changes 2021-12-15 01:44:04 +03:00
Gil Eluard a067a06071 Merge branch 'develop' into gil/5225_invite_to_space_in_room_landing
# Conflicts:
#	Riot/Modules/Room/RoomCoordinator.swift
2021-12-13 15:09:40 +01:00
Gil Eluard 2a09ca3947 Merge branch 'develop' into gil/5225_invite_to_space_in_room_landing
# Conflicts:
#	Riot/Modules/Room/RoomCoordinator.swift
2021-12-13 15:09:40 +01:00
ismailgulek f72cd70885 Merge branch 'ismail/5095_thread_search_results' into ismail/5096_thread_notifications 2021-12-10 11:14:55 +03:00
ismailgulek 746bd4a96c Merge branch 'ismail/5095_thread_search_results' into ismail/5096_thread_notifications 2021-12-10 11:14:55 +03:00
ismailgulek 1bc9db85c3 Merge branch 'ismail/5092_thread_list' into ismail/5094_thread_links 2021-12-10 11:08:01 +03:00
ismailgulek ffd7efbe2a Merge branch 'ismail/5092_thread_list' into ismail/5094_thread_links 2021-12-10 11:08:01 +03:00
ismailgulek 12aa8a1208 Merge branch 'ismail/5117_thread_message_actions' into ismail/5092_thread_list 2021-12-10 11:07:27 +03:00
ismailgulek 867c4dac7c Merge branch 'ismail/5117_thread_message_actions' into ismail/5092_thread_list 2021-12-10 11:07:27 +03:00
ismailgulek 048fa7d98e Merge branch 'ismail/5068_start_thread' into ismail/5117_thread_message_actions 2021-12-10 11:03:00 +03:00
ismailgulek d1b7953da6 Merge branch 'ismail/5068_start_thread' into ismail/5117_thread_message_actions 2021-12-10 11:03:00 +03:00
ismailgulek 3a6e7a19e2 Merge branch 'develop' into ismail/5068_start_thread 2021-12-09 15:25:14 +03:00
ismailgulek 8093844aea 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
Stefan Ceriu 17f2f71634 vector-im/element-ios/issues/5114 - Polls in the timeline. 2021-12-09 09:37:02 +02:00
Gil Eluard c1fa85be6f Invite to Space in room landing #5225
- Added participant invite coordinator
2021-12-08 23:21:55 +01:00
Gil Eluard 72ba8e6719 Invite to Space in room landing #5225
- Added participant invite coordinator
2021-12-08 23:21:55 +01:00
ismailgulek 254e714fc5 Hide jump to unread button on threads, override scroll to bottom action, fix #5264 2021-12-08 16:04:11 +03:00
ismailgulek fdcbaa601c Hide jump to unread button on threads, override scroll to bottom action, fix #5264 2021-12-08 16:04:11 +03:00
SBiOSoftWhare 575a32feda Merge pull request #5219 from vector-im/steve/5020_matrixkit_merge
Merge MatrixKit repository into Element
2021-12-03 15:44:30 +01:00
SBiOSoftWhare 3bb025cca1 Merge pull request #5219 from vector-im/steve/5020_matrixkit_merge
Merge MatrixKit repository into Element
2021-12-03 15:44:30 +01:00
ismailgulek 91dc172737 Clear highlighted event when view gone 2021-12-03 02:41:01 +03:00
ismailgulek de8e4f483a Clear highlighted event when view gone 2021-12-03 02:41:01 +03:00
ismailgulek c48c3a8fe7 Mark thread as read when viewed 2021-12-02 16:57:41 +03:00
ismailgulek 493f2ec2ed Mark thread as read when viewed 2021-12-02 16:57:41 +03:00
Stefan Ceriu c70c4fb70a vector-im/element-ios/issues/4753 - Allow audio file attachments to be played back inline by reusing the existing voice message UI. 2021-12-02 15:38:59 +02:00
Stefan Ceriu 3c3b8f24ba vector-im/element-ios/issues/4753 - Allow audio file attachments to be played back inline by reusing the existing voice message UI. 2021-12-02 15:38:59 +02:00
ismailgulek 107bb8f13c Update logic for thread list bar button item 2021-12-02 14:45:23 +03:00
ismailgulek 3e6637f5a8 Update logic for thread list bar button item 2021-12-02 14:45:23 +03:00
ismailgulek 719ef848b6 Create BadgedBarButtonItem class and use it for thread list item 2021-12-01 17:24:47 +03:00
ismailgulek d5b5a2d785 Create BadgedBarButtonItem class and use it for thread list item 2021-12-01 17:24:47 +03:00
SBiOSoftWhare e8d4af46d2 Update all Objective-C MatrixKit imports to handle new location. 2021-11-30 16:09:53 +01:00
SBiOSoftWhare 56a51da9f9 Update all Objective-C MatrixKit imports to handle new location. 2021-11-30 16:09:53 +01:00
ismailgulek 5237963986 Just highlight event when possible instead of reloading data source 2021-11-30 14:13:57 +03:00
ismailgulek f6e1129d16 Just highlight event when possible instead of reloading data source 2021-11-30 14:13:57 +03:00
ismailgulek abd5044023 Merge branch 'ismail/5092_thread_list' into ismail/5094_thread_links 2021-11-30 01:54:56 +03:00
ismailgulek 87f14a3898 Merge branch 'ismail/5092_thread_list' into ismail/5094_thread_links 2021-11-30 01:54:56 +03:00
ismailgulek d2323afaaa Merge branch 'ismail/5117_thread_message_actions' into ismail/5092_thread_list 2021-11-30 01:34:44 +03:00
ismailgulek 352e412b48 Merge branch 'ismail/5117_thread_message_actions' into ismail/5092_thread_list 2021-11-30 01:34:44 +03:00
ismailgulek 4164512542 Make remove actions destructive & move remove action to the bottom 2021-11-30 01:29:52 +03:00
ismailgulek e7486416ef Make remove actions destructive & move remove action to the bottom 2021-11-30 01:29:52 +03:00
ismailgulek aeeb6bef6f Merge branch 'ismail/5119_thread_root_removal' into ismail/5094_thread_links 2021-11-30 01:14:51 +03:00
ismailgulek 3a4488c51b Merge branch 'ismail/5119_thread_root_removal' into ismail/5094_thread_links 2021-11-30 01:14:51 +03:00
ismailgulek 525a1288ed Merge branch 'ismail/5117_thread_message_actions' into ismail/5119_thread_root_removal 2021-11-30 01:14:23 +03:00
ismailgulek 3b593ef24d Merge branch 'ismail/5117_thread_message_actions' into ismail/5119_thread_root_removal 2021-11-30 01:14:23 +03:00
ismailgulek 25f52e2473 Fix alert 2021-11-30 01:14:05 +03:00
ismailgulek 836ba15837 Fix alert 2021-11-30 01:14:05 +03:00
ismailgulek b77c7b9996 Display room title view for non-live timelines too 2021-11-30 01:13:14 +03:00
ismailgulek c19079ed50 Display room title view for non-live timelines too 2021-11-30 01:13:14 +03:00
ismailgulek a5c7cefbeb Merge branch 'ismail/5092_thread_list' into ismail/5094_thread_links 2021-11-26 01:46:32 +03:00