Commit Graph

1156 Commits

Author SHA1 Message Date
Andy Uhnak 43220de4f5 Revert optionality and always pass url 2022-03-22 14:46:27 +00:00
Andy Uhnak 82fed12a85 Revert optionality and always pass url 2022-03-22 14:46:27 +00:00
Frank Rotermund 4b1ca0ff7f Feature/2897 restricted user 2022-03-22 14:37:58 +00:00
Frank Rotermund c2108a2178 MESSENGER-2762 Initial Merge 2022-03-17 15:51:23 +01:00
Gil Eluard 1203c7725a Merge branch 'develop' into gil/5769_add_trigger_to_join_and_view_room_metrics_event
# Conflicts:
#	Riot/Modules/Analytics/Analytics.swift
2022-03-17 13:59:24 +01:00
Gil Eluard 45797a7384 Merge branch 'develop' into gil/5769_add_trigger_to_join_and_view_room_metrics_event
# Conflicts:
#	Riot/Modules/Analytics/Analytics.swift
2022-03-17 13:59:24 +01:00
Doug 66a257fe0b Make scrollEdgesAppearance singular to match UIKit 2022-03-16 08:58:21 +00:00
Doug 351cce0128 Make scrollEdgesAppearance singular to match UIKit 2022-03-16 08:58:21 +00:00
Gil Eluard bd0041c5dc Merge branch 'develop' into gil/5769_add_trigger_to_join_and_view_room_metrics_event 2022-03-15 10:32:19 +01:00
Gil Eluard 69cec41da0 Merge branch 'develop' into gil/5769_add_trigger_to_join_and_view_room_metrics_event 2022-03-15 10:32:19 +01:00
Gil Eluard 67b0df922f Add trigger to join and view room metrics events #5769
- Added trigger for JoinedRoom event
- Tracking ViewRoom event for rooms and events
2022-03-15 10:31:24 +01:00
Gil Eluard c747ff86ac Add trigger to join and view room metrics events #5769
- Added trigger for JoinedRoom event
- Tracking ViewRoom event for rooms and events
2022-03-15 10:31:24 +01:00
Andy Uhnak 2a7036819c Merge branch 'master' into develop 2022-03-14 16:26:07 +00:00
Andy Uhnak abce639820 Merge branch 'master' into develop 2022-03-14 16:26:07 +00:00
Andy Uhnak 0fed5c6a73 Name changes 2022-03-10 17:32:25 +00:00
Andy Uhnak ea179dda0a Name changes 2022-03-10 17:32:25 +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
Andy Uhnak 863d7ca2bd Do not show user indicators when the view controller is not visible 2022-03-10 15:56:40 +00:00
Gil Eluard cab04809c5 Merge pull request #5748 from vector-im/gil/SP1_space_creation
Creating & managing Spaces
2022-03-10 10:18:48 +01:00
Gil Eluard 7097a505cd Merge pull request #5748 from vector-im/gil/SP1_space_creation
Creating & managing Spaces
2022-03-10 10:18:48 +01:00
Andy Uhnak 72179db80f Replace user indicator presenting view controller with context 2022-03-09 09:11:47 +00:00
Andy Uhnak d1fb2bf389 Replace user indicator presenting view controller with context 2022-03-09 09:11:47 +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 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 24de57bb58 Instrument missing screen metrics (#5764)
* Instrument missing screen metrics

- Done
2022-03-08 10:13:46 +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 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
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
Doug c9cc59d006 Remove MatrixKitL10n from SwiftGen
Uses VectorL10n everywhere.
2022-03-03 09:34:54 +00:00
Doug 86c2b4ebb5 Remove MatrixKitL10n from SwiftGen
Uses VectorL10n everywhere.
2022-03-03 09:34:54 +00:00
Doug 8bcab947b0 Fix emptyView never being shown in RecentsViewController. 2022-03-02 11:43:18 +00:00
Doug 19f383ed9b Fix emptyView never being shown in RecentsViewController. 2022-03-02 11:43:18 +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
Anderas fda6ba2862 Merge pull request #5690 from vector-im/andy/5603_room_indicators
Room activity indicators
2022-03-01 13:08:29 +00:00
Gil Eluard 0abef4312e Merge branch 'develop' into gil/SP1_space_creation 2022-03-01 10:15:13 +01:00
Gil Eluard 72e280652a Merge branch 'develop' into gil/SP1_space_creation 2022-03-01 10:15:13 +01:00
aringenbach 60f2355e54 Move invites to dedicated sections and enable section collapse (#5683)
* Display invites in dedicated sections

* Activate shrinkable and fix home number of rows for section

* Rework section header

* Display badge in people and room tabs

* Add changelog & remove useless todo

* Improve isSectionShrinked condition, remove useless import and shrinkable sets

* Restore invitation count in tab bar badge

* Display badge for invites section

* Add comment on invites count

* Update right accessory view on data source update

Co-authored-by: Arnaud Ringenbach <arnaud.ringenbach@niji.fr>
2022-02-28 13:48:07 +01:00
aringenbach fe7cdaebc2 Move invites to dedicated sections and enable section collapse (#5683)
* Display invites in dedicated sections

* Activate shrinkable and fix home number of rows for section

* Rework section header

* Display badge in people and room tabs

* Add changelog & remove useless todo

* Improve isSectionShrinked condition, remove useless import and shrinkable sets

* Restore invitation count in tab bar badge

* Display badge for invites section

* Add comment on invites count

* Update right accessory view on data source update

Co-authored-by: Arnaud Ringenbach <arnaud.ringenbach@niji.fr>
2022-02-28 13:48:07 +01:00
Andy Uhnak 49e9eb925f Minor documentation changes 2022-02-28 10:05:11 +00:00
Andy Uhnak c52e15574f Minor documentation changes 2022-02-28 10:05:11 +00:00
Andy Uhnak 559bb88ae4 Room user indicators
Signed-off-by: Andy Uhnak <andyuhnak@gmail.com>
2022-02-25 10:47:53 +00:00
Andy Uhnak 4617b3ed69 Room user indicators
Signed-off-by: Andy Uhnak <andyuhnak@gmail.com>
2022-02-25 10:47:53 +00:00
Andy Uhnak 3399abd3eb Change shadow style in dark mode 2022-02-25 09:55:18 +00:00
Andy Uhnak be0c31b7ca Change shadow style in dark mode 2022-02-25 09:55:18 +00:00
Andy Uhnak 6b6b6af9a3 Enable home activity indicator
Signed-off-by: Andy Uhnak <andyuhnak@gmail.com>
2022-02-25 09:54:13 +00:00
Andy Uhnak d71f70db60 Enable home activity indicator
Signed-off-by: Andy Uhnak <andyuhnak@gmail.com>
2022-02-25 09:54:13 +00:00
Andy Uhnak fda96626e6 Revert presenter dismissal 2022-02-22 16:52:48 +00:00
Andy Uhnak 4db9bee398 Revert presenter dismissal 2022-02-22 16:52:48 +00:00
Andy Uhnak c9c8438250 Rename properties and arguments 2022-02-22 16:44:22 +00:00
Andy Uhnak 75d3d30c12 Rename properties and arguments 2022-02-22 16:44:22 +00:00