Commit Graph

7 Commits

Author SHA1 Message Date
JanNiklas Grabowski 1768fb5eee Merge commit 'aaadcc73674cc8886e363693a7d7c08ac9b4f516' into feature/4260_merge_foss_1_10_2
# Conflicts:
#	Config/AppVersion.xcconfig
#	Podfile
#	Podfile.lock
#	Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	Riot/Managers/EncryptionKeyManager/EncryptionKeyManager.swift
#	Riot/Modules/Application/LegacyAppDelegate.m
#	Riot/Modules/Authentication/AuthenticationCoordinator.swift
#	Riot/Modules/Authentication/Legacy/LegacyAuthenticationCoordinator.swift
#	Riot/Modules/ContextMenu/ActionProviders/RoomActionProvider.swift
#	Riot/Modules/Home/AllChats/AllChatsViewController.swift
#	Riot/Modules/Room/RoomInfo/RoomInfoCoordinator.swift
#	Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewController.swift
#	Riot/Modules/Room/Settings/RoomSettingsViewController.m
#	fastlane/Fastfile
2023-02-15 14:56:55 +01:00
Flavio Alescio 2a31567d46 function renamed as in sdk 2023-01-30 16:04:58 +01:00
Flavio Alescio d07d16ec86 function renamed 2023-01-27 15:28:02 +01:00
JanNiklas Grabowski 73ded73d25 MESSENGER-4039 new layout - add last admin function 2023-01-25 11:06:00 +00:00
Flavio Alescio 8fd6baa3c9 Add mark as unread option for rooms 2023-01-10 16:13:14 +01:00
Gil Eluard 64d52c3ae4 Add "Mark as read" (#6346)
* Add "Mark as read"

- done
2022-06-28 10:44:33 +02:00
Gil Eluard 1adfa904ae Add support for Apple context menus in matrix items list screens (#5963) 2022-04-04 20:07:06 +02:00