Commit Graph

775 Commits

Author SHA1 Message Date
SBiOSoftWhare c741202810 Add RoomPresentationParameters and RoomPreviewPresentationParameters to display a room or room preview with identifiers and presentation configuration. 2021-10-12 19:09:18 +02:00
Doug 6c11005319 Move call to validateSyncLocalContactsState into MatrixKit. 2021-10-12 11:17:20 +01:00
Doug 2848681c5e Move call to validateSyncLocalContactsState into MatrixKit. 2021-10-12 11:17:20 +01:00
SBiOSoftWhare 8dfd4ce787 Merge pull request #4960 from vector-im/steve/4734_master_tab_bar_refacto
Split view: Improve detail view management and add possibility to stack views on it
2021-10-11 17:23:20 +02:00
SBiOSoftWhare c3731a2ec0 Merge pull request #4960 from vector-im/steve/4734_master_tab_bar_refacto
Split view: Improve detail view management and add possibility to stack views on it
2021-10-11 17:23:20 +02:00
Doug 473511f8c6 Merge remote-tracking branch 'origin/develop' into doug/4484_contacts_access
# Conflicts:
#	Riot/Modules/ServiceTerms/Modal/ServiceTermsModalCoordinatorBridgePresenter.swift
2021-10-08 11:45:43 +01:00
Doug 8c9c69586f Merge remote-tracking branch 'origin/develop' into doug/4484_contacts_access
# Conflicts:
#	Riot/Modules/ServiceTerms/Modal/ServiceTermsModalCoordinatorBridgePresenter.swift
2021-10-08 11:45:43 +01:00
SBiOSoftWhare a294bce588 Add NavigationRouterStore that enables to get a NavigationRouter from a UINavigationController controller instance. 2021-10-05 10:48:52 +02:00
SBiOSoftWhare 37060ffa45 Add NavigationRouterStore that enables to get a NavigationRouter from a UINavigationController controller instance. 2021-10-05 10:48:52 +02:00
manuroe cea2c9af60 i18n: Standardise casing of identity server and integration manager. 2021-10-01 11:51:30 +01:00
manuroe 0500f703b2 i18n: Standardise casing of identity server and integration manager. 2021-10-01 11:51:30 +01:00
manuroe e5f9ee42f2 Merge branch 'master' into develop 2021-09-30 23:51:17 +01:00
manuroe a2ce7af946 Merge branch 'master' into develop 2021-09-30 23:51:17 +01:00
Doug 997ee54f20 Merge branch 'develop' into doug/4484_contacts_access
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
#	Riot/Modules/Application/LegacyAppDelegate.m
#	Riot/Modules/Settings/SettingsViewController.m
2021-09-30 11:14:02 +01:00
Doug 1c4b09b813 Merge branch 'develop' into doug/4484_contacts_access
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
#	Riot/Modules/Application/LegacyAppDelegate.m
#	Riot/Modules/Settings/SettingsViewController.m
2021-09-30 11:14:02 +01:00
Stefan Ceriu 7b75dec011 vector-im/element-ios/issues/4899 - Replaced (*almost*) all NSLocalizedString calls with newly generated ObjC methods. 2021-09-30 09:40:12 +03:00
Stefan Ceriu 8b80b3f4c7 vector-im/element-ios/issues/4899 - Replaced (*almost*) all NSLocalizedString calls with newly generated ObjC methods. 2021-09-30 09:40:12 +03:00
manuroe 9ac8624274 AppDelegate: Fix a crash when backgrounding the app
By avoiding to call [MXCrossSigning refreshStateWithSuccess]  because it leads to a crash in Realm.
2021-09-29 22:02:19 +01:00
manuroe 57d793008d AppDelegate: Fix a crash when backgrounding the app
By avoiding to call [MXCrossSigning refreshStateWithSuccess]  because it leads to a crash in Realm.
2021-09-29 22:02:19 +01:00
Gil Eluard 5521802bc2 [Spaces] M10.6.1 Handle space link #4498
- Update after code review
2021-09-23 17:15:32 +02:00
Gil Eluard 8fd88b2053 [Spaces] M10.6.1 Handle space link #4498
- Update after code review
2021-09-23 17:15:32 +02:00
Gil Eluard bcd72924c2 Merge branch 'spaces' into gil/4498_Handle_space_link 2021-09-23 15:26:29 +02:00
Gil Eluard 96a3624cf6 Merge branch 'spaces' into gil/4498_Handle_space_link 2021-09-23 15:26:29 +02:00
Gil Eluard c03997f97c Merge branch 'develop' into spaces 2021-09-23 15:26:06 +02:00
Gil Eluard bfe5835082 Merge branch 'develop' into spaces 2021-09-23 15:26:06 +02:00
Gil Eluard 6044ea45f5 Merge branch 'gil/pre_release_fixes' into gil/4498_Handle_space_link 2021-09-22 16:58:28 +02:00
Gil Eluard 8ced741f66 Merge branch 'gil/pre_release_fixes' into gil/4498_Handle_space_link 2021-09-22 16:58:28 +02:00
Stefan Ceriu fc3e70891a Merge branch 'develop' into stefan/4881-configurable-app-name-localization-strings
# Conflicts:
#	Riot/Generated/Strings.swift
2021-09-22 17:17:05 +03:00
Stefan Ceriu e6327eb955 Merge branch 'develop' into stefan/4881-configurable-app-name-localization-strings
# Conflicts:
#	Riot/Generated/Strings.swift
2021-09-22 17:17:05 +03:00
Stefan Ceriu b41cd1e1a4 Fixes #4881 - Replaced InfoPlist.cfBundleDisplayName with AppInfo.current.displayName and removed the now unused InfoPlist generated class. 2021-09-22 16:59:47 +03:00
Stefan Ceriu 9957f8f59a Fixes #4881 - Replaced InfoPlist.cfBundleDisplayName with AppInfo.current.displayName and removed the now unused InfoPlist generated class. 2021-09-22 16:59:47 +03:00
Gil Eluard 4068c1a55f Merge branch 'develop' into spaces
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
2021-09-22 15:39:06 +02:00
Gil Eluard 3c0a4c0633 Merge branch 'develop' into spaces
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
2021-09-22 15:39:06 +02:00
Gil Eluard 3db7e10c15 [Spaces] M10.6.1 Handle space link #4498
- Fixed universal links
- Added support for space links
2021-09-22 14:58:19 +02:00
Gil Eluard 1403d464ee [Spaces] M10.6.1 Handle space link #4498
- Fixed universal links
- Added support for space links
2021-09-22 14:58:19 +02:00
Stefan Ceriu cc8b6a8d75 Fixes #4881 - Using the bundle display name as the app name in localizable .strings files. Exposing generated .strings and info.plist members to Objective-C. 2021-09-22 14:10:16 +03:00
Stefan Ceriu 4dd70594cc Fixes #4881 - Using the bundle display name as the app name in localizable .strings files. Exposing generated .strings and info.plist members to Objective-C. 2021-09-22 14:10:16 +03:00
David Langley e8ff4e9154 Merge branch 'develop' of https://github.com/vector-im/element-ios into langleyd/4781_swiftui_template_examples 2021-09-15 14:33:05 +01:00
David Langley d189c4d618 Merge branch 'develop' of https://github.com/vector-im/element-ios into langleyd/4781_swiftui_template_examples 2021-09-15 14:33:05 +01:00
Gil Eluard 6335acc0cd Merge branch 'develop' into spaces
# Conflicts:
#	Riot/Modules/Common/Avatar/AvatarViewDataProtocol.swift
#	Riot/Modules/Common/Recents/RecentsViewController.m
#	Riot/Modules/Home/Views/RoomCollectionViewCell.m
#	Riot/Modules/TabBar/TabBarCoordinator.swift
2021-09-15 14:42:04 +02:00
Gil Eluard 9279d17226 Merge branch 'develop' into spaces
# Conflicts:
#	Riot/Modules/Common/Avatar/AvatarViewDataProtocol.swift
#	Riot/Modules/Common/Recents/RecentsViewController.m
#	Riot/Modules/Home/Views/RoomCollectionViewCell.m
#	Riot/Modules/TabBar/TabBarCoordinator.swift
2021-09-15 14:42:04 +02:00
Gil Eluard 21f5d73b6f [Spaces] M10.8 Browsing users in a space #4682
- Update after code review
2021-09-14 16:59:32 +02:00
Gil Eluard 5f8de45e25 [Spaces] M10.8 Browsing users in a space #4682
- Update after code review
2021-09-14 16:59:32 +02:00
Doug cf9b69c266 Call -MXKContactManager.validateSyncLocalContactsState when the app is launched. 2021-09-14 14:49:07 +01:00
Doug e0bda2360b Call -MXKContactManager.validateSyncLocalContactsState when the app is launched. 2021-09-14 14:49:07 +01:00
Gil Eluard 6caad7f61c [Spaces] M10.8 Browsing users in a space #4682
- Update after code review
2021-09-14 15:29:16 +02:00
Gil Eluard 99cbeab6f3 [Spaces] M10.8 Browsing users in a space #4682
- Update after code review
2021-09-14 15:29:16 +02:00
Gil Eluard aa931a3c1a [Spaces] M10.8 Browsing users in a space #4682
- Update after code review
2021-09-14 11:45:33 +02:00
Gil Eluard de09af397f [Spaces] M10.8 Browsing users in a space #4682
- Update after code review
2021-09-14 11:45:33 +02:00
Stefan Ceriu ee417c21d8 Revert "Revert "#4693 - Drop iOS 11 support."" 2021-09-14 11:41:36 +03:00