You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
session-ios/SessionMessagingKit/Calls
Morgan Pretty fa39b5f61c Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Calls/CallVC.swift
#	Session/Conversations/Message Cells/Content Views/DocumentView.swift
#	Session/Conversations/Settings/OWSMessageTimerView.m
#	SessionMessagingKit/File Server/FileServerAPI.swift
#	SessionMessagingKit/Messages/Visible Messages/VisibleMessage.swift
#	SessionMessagingKit/Open Groups/OpenGroupManager.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver.swift
#	SessionMessagingKit/Shared Models/MessageViewModel.swift
#	SessionMessagingKit/Shared Models/SessionThreadViewModel.swift
#	SessionSnodeKit/SnodeAPI.swift
#	SessionUtilitiesKit/Networking/HTTP.swift
#	SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentTextToolbar.swift
2 years ago
..
CallManagerProtocol.swift Fixed all of the build errors from merge, migrated Call logic, started idBlinding migration and bug fixes 3 years ago
CallMode.swift Fixed all of the build errors from merge, migrated Call logic, started idBlinding migration and bug fixes 3 years ago
CurrentCallProtocol.swift fix a case when the app goes into background with an ongoing call 3 years ago
EndCallMode.swift Fixed all of the build errors from merge, migrated Call logic, started idBlinding migration and bug fixes 3 years ago
TurnServerInfo.swift Fixed all of the build errors from merge, migrated Call logic, started idBlinding migration and bug fixes 3 years ago
WebRTC+Utilities.swift
WebRTCSession+DataChannel.swift Fixed all of the build errors from merge, migrated Call logic, started idBlinding migration and bug fixes 3 years ago
WebRTCSession+MessageHandling.swift Refactored the remaining references to PromiseKit 2 years ago
WebRTCSession+UI.swift WIP: refactor on the call UI to add switching function of caller and callee's video views 2 years ago
WebRTCSession.swift Finished off a few remaining bits and pieces 2 years ago