Commit Graph

16 Commits

Author SHA1 Message Date
Frank Rotermund 09a0f6334c Merge commit '80bda1906235b6007b98f18fb13681fff587f4a3' into feature/basis_update_192
# Conflicts:
#	Config/AppVersion.xcconfig
#	Config/BuildSettings.swift
#	DesignKit/Source/ColorsSwiftUI.swift
#	DesignKit/Source/FontsSwiftUI.swift
#	DesignKit/Source/ThemeV2.swift
#	DesignKit/Variants/Colors/Dark/DarkColors.swift
#	DesignKit/Variants/Colors/Light/LightColors.swift
#	Podfile.lock
#	Riot/Assets/de.lproj/InfoPlist.strings
#	Riot/Assets/de.lproj/Vector.strings
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Images.swift
#	Riot/Generated/Strings.swift
#	Riot/Managers/PushNotification/PushNotificationService.m
#	Riot/Managers/Settings/RiotSettings.swift
#	Riot/Modules/Common/Recents/DataSources/RecentsDataSource.h
#	Riot/Modules/Common/Recents/RecentsViewController.m
#	Riot/Modules/Communities/Home/GroupHomeViewController.m
#	Riot/Modules/Room/RoomViewController.m
#	Riot/Modules/SetPinCode/PinCodePreferences.swift
#	Riot/Modules/Settings/SettingsViewController.m
#	Riot/Modules/TabBar/MasterTabBarController.h
#	Riot/Modules/TabBar/MasterTabBarController.m
#	Riot/Modules/TabBar/TabBarCoordinator.swift
#	fastlane/Fastfile
#	project.yml
2022-09-19 14:42:25 +02:00
Frank Rotermund 0a2fd53134 MESSENGER-3304 string in separate files 2022-09-19 11:53:45 +02:00
Andy Uhnak 74b369e3af Track all errors in Sentry 2022-08-23 08:14:59 +01:00
Philippe Loriaux 8491aaed77 Display the option "Share invite link" only when the room is accessible by link (#6496) 2022-08-18 15:37:00 +02:00
Gil Eluard fdb6593052 Invite user UI is always hidden by the keyboard (#6348)
* Invite user UI is always hidden by the keyboard

- fixed
2022-07-01 10:32:57 +02:00
Gil Eluard da9c921efb 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 40fdba0cc1 SP1.2: Invite to Space in room landing element-ios#5225
- Update after review
2022-02-03 23:44:07 +01:00
Gil Eluard bfea80a234 Update Riot/Modules/Room/ParticipantsInviteModal/ContactsPicker/RoomInviteViewController.swift
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
2022-02-03 20:59:44 +01:00
Gil Eluard ddf14b8ba4 Update Riot/Modules/Room/ParticipantsInviteModal/RoomParticipantsInviteModalCoordinatorBridgePresenter.swift
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
2022-02-03 20:58:25 +01:00
Gil Eluard 98a83783cc Update Riot/Modules/Room/ParticipantsInviteModal/ContactsPicker/ContactsPickerViewModel.swift
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
2022-02-03 20:56:47 +01:00
Gil Eluard d460f5743b SP1.2: Invite to Space in room landing element-ios#5225
- update after design review
2022-01-27 14:34:03 +01:00
Gil Eluard 17667dada7 SP1.2: Invite to Space in room landing element-ios#5225
- Check user permissions to invite people
2022-01-26 10:17:42 +01:00
Gil Eluard 0cb94a0659 Invite to Space in room landing #5225
- added room option bottom sheet
2021-12-13 22:16:02 +01:00
Gil Eluard fe4d84ec06 Implement FAB journeys & rough edge warnings element-ios#5226
- List of Space members with search
- Invite interactions
- Join room from list
- Implement add room button, with rough edge warning.
2021-12-10 09:59:10 +01:00
Gil Eluard 4f58ee524d Invite to Space in room landing #5225
- add share invite link to contacts screen
- Fixed regression
2021-12-09 16:12:44 +01:00
Gil Eluard 919911d53b Invite to Space in room landing #5225
- Added participant invite coordinator
2021-12-08 23:21:55 +01:00