Commit Graph

529 Commits

Author SHA1 Message Date
Andy Uhnak 2a7036819c Merge branch 'master' into develop 2022-03-14 16:26:07 +00:00
Andy Uhnak 9751d22772 Anchor action sheet to source view 2022-03-14 08:47:52 +00:00
Andy Uhnak e0adc29903 Ignore the sender of a room invite without needing to join the room first 2022-03-11 16:24:40 +00:00
Arnaud Ringenbach 63cb0e0ce7 Room: Refresh header when call actions become available 2022-03-11 09:09:49 +01:00
Andy Uhnak 18d0ccf6b7 Add more comments 2022-03-10 17:40:23 +00:00
Andy Uhnak 902a227e8d Do not show user indicators when the view controller is not visible 2022-03-10 15:56:40 +00:00
Gil Eluard 4f43793313 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 24de57bb58 Instrument missing screen metrics (#5764)
* Instrument missing screen metrics

- Done
2022-03-08 10:13:46 +01:00
Gil Eluard dcebd89fdf selection impossible when filtering in add room screen #5757 (#5758)
- Fixed
- Other minor code / UI tweaks
2022-03-07 12:25:50 +01:00
Gil Eluard 42b4144323 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
Doug c9cc59d006 Remove MatrixKitL10n from SwiftGen
Uses VectorL10n everywhere.
2022-03-03 09:34:54 +00:00
Anderas 7c3a86c24d Merge pull request #5690 from vector-im/andy/5603_room_indicators
Room activity indicators
2022-03-01 13:08:29 +00:00
ismailgulek 67709c7da5 Merge pull request #5709 from vector-im/ismail/5365_thread_analytics
Threads: Analytics
2022-03-01 15:23:47 +03:00
Gil Eluard 0abef4312e Merge branch 'develop' into gil/SP1_space_creation 2022-03-01 10:15:13 +01:00
SBiOSoftWhare 02df90249c Timeline: Rename call cells. 2022-02-28 16:48:41 +01:00
Gil Eluard bca69bb7c8 SP3.1: Update room settings for Spaces #5231
- Update after review
2022-02-28 16:07:09 +01:00
ismailgulek cd031a631e Implement analytics for threads 2022-02-28 17:46:57 +03:00
MaximeE 3a9d847954 3779: Add comments 2022-02-25 17:03:09 +01:00
MaximeE 8580195006 3779: Apply PR comments 2022-02-25 16:22:15 +01:00
MaximeE ec9e45ed43 Merge branch 'develop' into maximee/3779_fix_reply_after_jump_unread 2022-02-25 15:17:01 +01:00
MaximeE 4f4471a65a 3779: Apply PR comments 2022-02-25 12:18:28 +01:00
Andy Uhnak 559bb88ae4 Room user indicators
Signed-off-by: Andy Uhnak <andyuhnak@gmail.com>
2022-02-25 10:47:53 +00:00
Anderas a5f3987bd1 Merge pull request #5630 from vector-im/andy/5605_leave_room
Update activity indicators on leaving room
2022-02-25 09:52:03 +00:00
MaximeE d3056d0ad0 3779: show the input tool bar on timeline not live 2022-02-23 11:03:22 +01:00
Gil Eluard 079d50e733 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 ceb74c2f6e 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
Andy Uhnak 9eae7c02bb Update activity indicators on leaving room
Signed-off-by: Andy Uhnak <andyuhnak@gmail.com>
2022-02-18 13:31:21 +00:00
SBiOSoftWhare 3351af3e9d RoomDataSource: Use RoomTimelineCellDecorator to animate read marker dismiss. 2022-02-17 17:46:26 +01:00
Stefan Ceriu 02ab8eec9e Merge branch 'master' into develop 2022-02-16 12:45:06 +02:00
Doug 37a0c72169 Fix for images sometimes being sent unencrypted in an encrypted room. 2022-02-16 12:42:00 +02:00
ismailgulek c740a8110e Use thread protocols where possible 2022-02-11 18:11:44 +03:00
aringenbach 2f6546799e Add objective C support to SwiftGen assets helpers (#5533)
* Add objective C support to SwiftGen assets helpers

* Use dot notation in ObjC & fix minor issues

Co-authored-by: Arnaud Ringenbach <arnaud.ringenbach@niji.fr>
2022-02-10 17:13:23 +01:00
Stefan Ceriu 4b1eb75fd3 Fixed various project warnings. Completely disabled nullability checks, went down from ~20k to 195. 2022-02-10 08:43:18 +02:00
SBiOSoftWhare 8947fd6549 RoomVC: Handle emote cell identifiers. 2022-02-08 11:57:45 +01:00
Gil Eluard fd765a9288 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
SBiOSoftWhare e090fef42e Merge branch 'develop' into steve/5210_bubble_polls 2022-02-04 16:32:33 +01:00
Gil Eluard f4fa9e97e3 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
Stefan Ceriu 6839da94d8 vector-im/element-ios/issues/5298 - Reusing location sharing coordinator external sharing logic in the timeline. 2022-02-04 11:33:55 +02:00
ismailgulek d861506d9f Fix review remarks 2022-02-03 14:25:14 +03:00
ismailgulek 1face7d301 Merge branch 'develop' into ismail/5096_thread_notifications 2022-02-03 14:01:21 +03:00
SBiOSoftWhare e31dfe0e40 RoomVC: Handle poll cell identifiers. 2022-02-03 09:56:59 +01:00
Anderas 0fa465f8bd Merge pull request #5484 from vector-im/andy/4524-fix-timeline-scroll
Scroll to the bottom of timeline automatically
2022-02-02 16:03:12 +00:00
Andy Uhnak d5ce90b3d9 Scroll to the bottom of timeline automatically, fixes #4524
Signed-off-by: Andy Uhnak <andyuhnak@gmail.com>
2022-02-02 14:58:33 +00:00
ismailgulek e84e78b1e7 Merge branch 'develop' into ismail/5096_thread_notifications 2022-02-02 12:46:00 +03:00
Stefan Ceriu 500aba906e De-labs location sharing and enable it by default. 2022-02-02 09:59:45 +02:00
SBiOSoftWhare 22f72fdf28 Merge pull request #5461 from vector-im/steve/5209_media_bubbles_2
Message bubbles: Layout for media (part 2)
2022-02-01 17:52:19 +01:00
SBiOSoftWhare 5e11c6c6c8 RoomViewController: Handle file without thumbnail cell identifiers. 2022-01-31 10:48:35 +01:00
ismailgulek a13d5704dc Merge branch 'develop' into ismail/5096_thread_notifications 2022-01-27 03:20:25 +03:00
ismailgulek cf8ff7dc2e Make remove poll action destructive as well 2022-01-26 16:03:17 +03:00
ismailgulek ae57c7e1fb Fix Doug's remarks 2022-01-26 15:58:37 +03:00