Commit graph

65 commits

Author SHA1 Message Date
ismailgulek
c3acbf5d41
Avoid thread view controller pushing twice 2022-03-16 13:34:55 +03:00
Gil Eluard
996ef72498 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
9ebd8a4802
Instrument missing screen metrics (#5764)
* Instrument missing screen metrics

- Done
2022-03-08 10:13:46 +01:00
Gil Eluard
aadf1b7d67 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
ace8613162 SP3.1: Update room settings for Spaces #5231
- Update after review
2022-02-28 16:07:09 +01:00
ismailgulek
17f18a80cc
Implement analytics for threads 2022-02-28 17:46:57 +03:00
Gil Eluard
8bd67bdc52 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
8fa0a673d6 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
c067916ea4 Merge branch 'master' into develop 2022-02-16 12:45:06 +02:00
Doug
0890307493 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
5967e7fbb6
Display thread list api errors 2022-02-15 15:46:22 +03:00
ismailgulek
ee2b4e4058
Use new api to fetch thread list 2022-02-10 17:35:18 +03:00
ismailgulek
1fa8da3f34
Use thread protocol when possible 2022-02-10 16:48:27 +03:00
Stefan Ceriu
4bd5c12f73 Fixed various project warnings. Completely disabled nullability checks, went down from ~20k to 195. 2022-02-10 08:43:18 +02:00
Gil Eluard
96cf359703 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
f9a1fdfe85 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
9f686da45e
Fix review remarks 2022-02-03 14:25:14 +03:00
ismailgulek
3dec412178
Merge branch 'develop' into ismail/5096_thread_notifications 2022-01-27 03:20:25 +03:00
ismailgulek
f14b47171a
Merge branch 'ismail/5068_start_thread' into ismail/5068_design_tweaks 2022-01-27 02:01:55 +03:00
ismailgulek
815f1f586a
Fix further review remarks 2022-01-27 01:45:01 +03:00
ismailgulek
9327626021
Fix Doug's remarks 2022-01-26 15:58:37 +03:00
ismailgulek
67da0c0955
Merge branch 'ismail/5068_start_thread' into ismail/5068_design_tweaks 2022-01-26 14:27:25 +03:00
ismailgulek
c23a69c338
Fix review remarks 2022-01-25 23:59:19 +03:00
ismailgulek
03977b893b
Implement going back to live room data sources for threads, fix bugs around it 2022-01-21 01:56:51 +03:00
ismailgulek
caf5672f46
Do not show badge for not participated threads 2022-01-21 00:09:25 +03:00
ismailgulek
1e3ec62c1f
Fix toast bottom margin for header action 2022-01-20 23:20:45 +03:00
ismailgulek
ec8acd042d
Merge branch 'ismail/5068_design_tweaks' into ismail/5096_thread_notifications 2022-01-19 00:12:40 +03:00
ismailgulek
0cb4d66853
Center empty view vertically in the whole screen 2022-01-18 02:57:30 +03:00
ismailgulek
b7b84ad461
Align summary last message to the time label 2022-01-18 02:27:23 +03:00
ismailgulek
d7ed2d3b09
Fix event content where the thread root event is a reply event 2022-01-17 16:33:02 +03:00
ismailgulek
d5de3a9b2f
Various design fixes 2022-01-17 16:32:32 +03:00
ismailgulek
8cfec2f908
Thread summary view design changes 2022-01-17 13:51:05 +03:00
ismailgulek
586f2e523d
Merge branch 'ismail/5068_design_tweaks' into ismail/5096_thread_notifications 2022-01-12 13:58:48 +03:00
ismailgulek
62386b2cf9
Implement thread list filtered icon, part of #5359 2022-01-11 14:00:37 +03:00
ismailgulek
357515bd8a
Fix context menu action orders & layout fixes 2022-01-06 03:22:14 +03:00
ismailgulek
b7936de6f3
Fix encryption badges for unencrypted rooms 2022-01-06 02:54:58 +03:00
ismailgulek
42a44dd3f5
Implement toast messages when links are copied 2022-01-06 02:41:57 +03:00
ismailgulek
36d1873c98
Implement thread list long press actions, fix #5310 2022-01-05 13:26:13 +03:00
ismailgulek
a69738266c
Fix root message redaction 2022-01-04 18:07:39 +03:00
ismailgulek
9a5bc717ad
Layout fixes 2022-01-04 17:27:13 +03:00
ismailgulek
e422917cf3
User name coloring on thread list 2022-01-04 17:26:47 +03:00
ismailgulek
2c1324ba74
Update icons & summary view margins 2022-01-04 16:20:40 +03:00
ismailgulek
d954e1865b
Use live timeline of a thread 2021-12-21 16:44:11 +03:00
ismailgulek
075495f20a
Hide jump to unread button on threads, override scroll to bottom action, fix #5264 2021-12-08 16:04:11 +03:00
ismailgulek
117461d80b
Do not send typing notifications from threads, part of #5271 2021-12-08 14:53:54 +03:00
ismailgulek
3f14b000d2
Disable partial text message on threads 2021-12-08 14:46:03 +03:00
ismailgulek
42185a2ec2
Use attributed string for thread last message 2021-12-03 00:55:13 +03:00
ismailgulek
95622672b4
Use attributed string for thread root message 2021-12-03 00:46:55 +03:00
ismailgulek
1fac638bfd
Mark thread as read when viewed 2021-12-02 16:57:41 +03:00
ismailgulek
6993f85521
Add thread notification dots 2021-12-01 14:42:05 +03:00