felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-01 05:36:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '3d672a05b2a7117ade2e4e87bd2b5762063d7922' into feature/3977_merge_element_1_9_13

Browse Source 
# Conflicts:
#	Config/AppVersion.xcconfig
#	Podfile.lock
#	Riot/Modules/Application/LegacyAppDelegate.m
#	Riot/Modules/Authentication/AuthenticationCoordinator.swift
#	Riot/Modules/Authentication/Legacy/LegacyAuthenticationCoordinator.swift
#	Riot/Modules/LaunchLoading/LaunchLoadingView.swift
#	Riot/Modules/LaunchLoading/LaunchLoadingView.xib
#	Riot/Modules/MatrixKit/Models/Account/MXKAccount.m
#	Riot/Modules/MatrixKit/Models/Room/MXKRoomBubbleCellData.m
#	Riot/Modules/Room/TimelineCells/Styles/Bubble/BubbleRoomTimelineCellProvider.m
#	Riot/Modules/Room/TimelineCells/Styles/Plain/PlainRoomTimelineCellProvider.m
#	Riot/Modules/TabBar/MasterTabBarController.m
#	fastlane/Fastfile
This commit is contained in:
Frank Rotermund
2022-12-19 14:36:30 +01:00
parent c0c59dd9b4 5dec9553c3
commit 0fca000b8d
245 changed files with 5346 additions and 1952 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/TimelineCells/RoomTimelineCellIdentifier.h
+6 -6
View File
@@ -171,13 +171,13 @@ typedef NS_ENUM(NSUInteger, RoomTimelineCellIdentifier) {
// - Voice broadcast
// -- Incoming
RoomTimelineCellIdentifierIncomingVoiceBroadcast,
RoomTimelineCellIdentifierIncomingVoiceBroadcastWithoutSenderInfo,
RoomTimelineCellIdentifierIncomingVoiceBroadcastWithPaginationTitle,
RoomTimelineCellIdentifierIncomingVoiceBroadcastPlayback,
RoomTimelineCellIdentifierIncomingVoiceBroadcastPlaybackWithoutSenderInfo,
RoomTimelineCellIdentifierIncomingVoiceBroadcastPlaybackWithPaginationTitle,
// -- Outgoing
RoomTimelineCellIdentifierOutgoingVoiceBroadcast,
RoomTimelineCellIdentifierOutgoingVoiceBroadcastWithoutSenderInfo,
RoomTimelineCellIdentifierOutgoingVoiceBroadcastWithPaginationTitle,
RoomTimelineCellIdentifierOutgoingVoiceBroadcastPlayback,
RoomTimelineCellIdentifierOutgoingVoiceBroadcastPlaybackWithoutSenderInfo,
RoomTimelineCellIdentifierOutgoingVoiceBroadcastPlaybackWithPaginationTitle,
// - Voice broadcast recorder
RoomTimelineCellIdentifierOutgoingVoiceBroadcastRecorder,