oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
session-ios/Session/Conversations
History
Morgan Pretty 1c575e520d Merge remote-tracking branch 'upstream/voice-calls-2' into feature/session-id-blinding-part-2 
# Conflicts:
#	Podfile.lock
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/Views & Modals/JoinOpenGroupModal.swift
#	Session/Home/HomeVC.swift
#	Session/Open Groups/JoinOpenGroupVC.swift
#	Session/Utilities/BackgroundPoller.swift
#	SessionMessagingKit/Jobs/AttachmentUploadJob.swift
#	SessionMessagingKit/Open Groups/OpenGroupAPIV2.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift
#	SessionNotificationServiceExtension/NotificationServiceExtension.swift
 		2022-04-26 13:06:12 +10:00
..
Context Menu do not show copy session id option when long press messages in open groups 2021-12-15 16:32:45 +11:00
Input View Further work on Id Blinding 2022-03-01 14:06:37 +11:00
Message Cells Merge remote-tracking branch 'upstream/voice-calls-2' into feature/session-id-blinding-part-2 2022-04-26 13:06:12 +10:00
Settings Merge branch 'dev' into feature/session-id-blinding-part-2 2022-03-31 12:03:00 +11:00
Views & Modals Merge remote-tracking branch 'upstream/voice-calls-2' into feature/session-id-blinding-part-2 2022-04-26 13:06:12 +10:00
ConversationMessageMapping.swift Minor tweaks to the message request banner on the HomeVC 2022-03-01 17:25:53 +11:00
ConversationSearch.swift Clean 2021-02-19 16:02:19 +11:00
ConversationVC+Interaction.swift Merge remote-tracking branch 'upstream/voice-calls-2' into feature/session-id-blinding-part-2 2022-04-26 13:06:12 +10:00
ConversationVC.swift Merge remote-tracking branch 'upstream/voice-calls-2' into feature/session-id-blinding-part-2 2022-04-26 13:06:12 +10:00
ConversationViewAction.h Clean 2021-02-19 16:02:19 +11:00
ConversationViewItem+Refactor.swift Further work on unit tests (and a couple of bug fixes found when testing) 2022-03-07 17:43:30 +11:00
ConversationViewItem.h Merge remote-tracking branch 'upstream/voice-calls-2' into feature/session-id-blinding-part-2 2022-04-26 13:06:12 +10:00
ConversationViewItem.m Merge remote-tracking branch 'upstream/voice-calls-2' into feature/session-id-blinding-part-2 2022-04-26 13:06:12 +10:00
ConversationViewModel.h clean 2022-02-25 11:50:56 +11:00
ConversationViewModel.m Merge branch 'dev' into feature/remove-unused-code 2022-03-31 11:51:59 +11:00
LongTextViewController.swift Merge branch 'remove-unused-code' into voice-calls-2 2022-04-04 11:08:54 +10:00