Commit Graph

5 Commits

Author SHA1 Message Date
Frank Rotermund 7bd8da0a7e Feature/3120 location sharing 2022-07-27 11:58:38 +00:00
Frank Rotermund ec12c42c54 Merge branch 'master' of https://github.com/vector-im/element-ios into feature/3269_merge_element_1_8_18
# Conflicts:
#	Config/AppIdentifiers.xcconfig
#	Config/AppVersion.xcconfig
#	Podfile
#	Podfile.lock
#	Riot/Assets/de.lproj/Vector.strings
#	Riot/Generated/Images.swift
#	Riot/Modules/Analytics/DecryptionFailureTracker.m
#	Riot/Modules/Application/LegacyAppDelegate.h
#	Riot/Modules/Onboarding/OnboardingCoordinator.swift
#	Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewController.swift
#	Riot/Modules/Room/RoomViewController.m
#	Riot/SupportingFiles/Info.plist
#	Riot/Utils/EventFormatter.m
#	Riot/Utils/Tools.h
#	Riot/Utils/Tools.m
#	Riot/target.yml
#	RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift
#	fastlane/Fastfile
#	project.yml
2022-06-12 19:49:46 +02:00
Frank Rotermund 475fe67c2a MESSENGER_2910 buildfixes 1.8.13 mostly Location 2022-05-05 09:46:59 +02:00
SBiOSoftWhare 4a73ec5fce RoomVC: Add location sharing cell actions. 2022-05-03 15:58:56 +02:00
SBiOSoftWhare fbcd679aee RoomViewController: Add a category to handle location sharing. 2022-03-28 10:17:05 +02:00