Commit Graph

70 Commits

Author SHA1 Message Date
ismailgulek 78e77e610a Strip in reply to from thread summary and from the latest message 2022-03-31 13:48:48 +03:00
ismailgulek dc2183a3bd Merge branch 'develop' into ismail/5770_threads_notice 2022-03-30 13:35:14 +03:00
Andy Uhnak fadfa48f9f Join room loading indicators 2022-03-29 15:03:09 +01:00
MaximeE 7f140388a1 5720: Rework some location sharing related view 2022-03-23 15:48:19 +01:00
ismailgulek 653b26161e Implement notice screen 2022-03-18 13:22:47 +03:00
ismailgulek cfcf437782 Avoid thread view controller pushing twice 2022-03-16 13:34:55 +03:00
Gil Eluard cdd66146d8 Merge branch 'develop' into gil/SP1_space_creation
# Conflicts:
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Room/RoomViewController.m
#	Riot/Modules/Room/Settings/RoomSettingsViewController.h
#	Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
2022-03-08 11:23:55 +01:00
Gil Eluard acf7d0de13 Instrument missing screen metrics (#5764)
* Instrument missing screen metrics

- Done
2022-03-08 10:13:46 +01:00
Gil Eluard 59038e18c1 Merge branch 'develop' into gil/SP1_space_creation
# Conflicts:
#	Config/BuildSettings.swift
#	Riot/Generated/Strings.swift
#	Riot/Modules/Home/HomeViewController.m
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
2022-03-04 13:38:18 +01:00
Gil Eluard c84285955b SP3.1: Update room settings for Spaces #5231
- Update after review
2022-02-28 16:07:09 +01:00
ismailgulek 3f1f75f7ce Implement analytics for threads 2022-02-28 17:46:57 +03:00
Gil Eluard f9b008e684 Merge branch 'gil/SP1_space_creation' into gil/5231_SP3-1_Update_room_settings_for_Spaces
# Conflicts:
#	Podfile.lock
2022-02-21 17:57:58 +01:00
Gil Eluard ff685a4c37 Merge branch 'develop' into gil/SP1_space_creation
# Conflicts:
#	Riot/Modules/People/PeopleViewController.m
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Spaces/SpaceList/SpaceListViewModel.swift
2022-02-21 17:20:58 +01:00
Stefan Ceriu 92f633cccb Merge branch 'master' into develop 2022-02-16 12:45:06 +02:00
Doug 92e7522324 Only no-op the actual sending of a typing notification.
The logic around when to send a typing notification also includes logic around when to exchange encryption keys.
handleTypingNotification renamed to handleTypingState for clarity.
2022-02-16 12:42:00 +02:00
ismailgulek edc2905e4d Display thread list api errors 2022-02-15 15:46:22 +03:00
ismailgulek 5b8246aa58 Use new api to fetch thread list 2022-02-10 17:35:18 +03:00
ismailgulek 18c44c2c06 Use thread protocol when possible 2022-02-10 16:48:27 +03:00
Stefan Ceriu 1ab7643de1 Fixed various project warnings. Completely disabled nullability checks, went down from ~20k to 195. 2022-02-10 08:43:18 +02:00
Gil Eluard ae27b06f0d Merge branch gil/5230_SP2-Adding_Rooms_to_Spaces into gil/5231_SP3-1_Update_room_settings_for_Spaces 2022-02-05 21:43:29 +01:00
Gil Eluard 0ae38858da Merge branch 'develop' into gil/SP1_space_creation
# Conflicts:
#	Riot/Modules/Room/RoomCoordinatorBridgePresenter.swift
#	Riot/Modules/Room/RoomCoordinatorParameters.swift
#	Riot/Modules/Room/RoomViewController.m
#	Riot/Modules/TabBar/TabBarCoordinator.swift
2022-02-04 14:29:57 +01:00
ismailgulek 2a95516545 Fix review remarks 2022-02-03 14:25:14 +03:00
ismailgulek d2e5e29ad9 Merge branch 'develop' into ismail/5096_thread_notifications 2022-01-27 03:20:25 +03:00
ismailgulek 81543d6de3 Merge branch 'ismail/5068_start_thread' into ismail/5068_design_tweaks 2022-01-27 02:01:55 +03:00
ismailgulek 558b43763f Fix further review remarks 2022-01-27 01:45:01 +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 a24e208cb1 Fix review remarks 2022-01-25 23:59:19 +03:00
ismailgulek 5c653b5346 Implement going back to live room data sources for threads, fix bugs around it 2022-01-21 01:56:51 +03:00
ismailgulek 6cf5e15d70 Do not show badge for not participated threads 2022-01-21 00:09:25 +03:00
ismailgulek e178ea3f04 Fix toast bottom margin for header action 2022-01-20 23:20:45 +03:00
ismailgulek 8cee4153e5 Merge branch 'ismail/5068_design_tweaks' into ismail/5096_thread_notifications 2022-01-19 00:12:40 +03:00
ismailgulek 71fe8475af Center empty view vertically in the whole screen 2022-01-18 02:57:30 +03:00
ismailgulek c00037591c Align summary last message to the time label 2022-01-18 02:27:23 +03:00
ismailgulek d363cfdd93 Fix event content where the thread root event is a reply event 2022-01-17 16:33:02 +03:00
ismailgulek fb643ed8c0 Various design fixes 2022-01-17 16:32:32 +03:00
ismailgulek feb7190fe2 Thread summary view design changes 2022-01-17 13:51:05 +03:00
ismailgulek 7cb920e582 Merge branch 'ismail/5068_design_tweaks' into ismail/5096_thread_notifications 2022-01-12 13:58:48 +03:00
ismailgulek 462ec32c0b Implement thread list filtered icon, part of #5359 2022-01-11 14:00:37 +03:00
ismailgulek 4903e69fc3 Fix context menu action orders & layout fixes 2022-01-06 03:22:14 +03:00
ismailgulek 7e5a92d5af Fix encryption badges for unencrypted rooms 2022-01-06 02:54:58 +03:00
ismailgulek addb8bf722 Implement toast messages when links are copied 2022-01-06 02:41:57 +03:00
ismailgulek f408750e81 Implement thread list long press actions, fix #5310 2022-01-05 13:26:13 +03:00
ismailgulek 30497de61c Fix root message redaction 2022-01-04 18:07:39 +03:00
ismailgulek c0ada7adf3 Layout fixes 2022-01-04 17:27:13 +03:00
ismailgulek b811010b8f User name coloring on thread list 2022-01-04 17:26:47 +03:00
ismailgulek ec69538fe5 Update icons & summary view margins 2022-01-04 16:20:40 +03:00
ismailgulek 9f6623c7e2 Use live timeline of a thread 2021-12-21 16:44:11 +03: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 78b402c232 Do not send typing notifications from threads, part of #5271 2021-12-08 14:53:54 +03:00