session-ios/SessionMessagingKit
Morgan Pretty 5ca227434b Merge branch 'dev' into feature/session-id-blinding-part-2
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Utilities/BackgroundPoller.swift
#	SessionMessagingKit/Database/Storage+OpenGroups.swift
#	SessionMessagingKit/Messages/Control Messages/ConfigurationMessage+Convenience.swift
#	SessionMessagingKit/Open Groups/OpenGroupAPIV2.swift
#	SessionMessagingKit/Open Groups/OpenGroupManagerV2.swift
#	SessionMessagingKit/Sending & Receiving/MessageSender.swift
#	SessionMessagingKit/Sending & Receiving/Pollers/OpenGroupPollerV2.swift
#	SessionMessagingKit/Sending & Receiving/Pollers/Poller.swift
#	SessionMessagingKit/Storage.swift
#	SessionMessagingKit/Utilities/General.swift
#	SessionSnodeKit/SnodeAPI.swift
#	SessionUtilitiesKit/General/Atomic.swift
2022-03-29 09:15:32 +11:00
..
Common Networking Added more unit tests 2022-03-18 16:39:25 +11:00
Contacts Added more unit tests for the OpenGroupManager 2022-03-17 12:05:04 +11:00
Database Merge branch 'dev' into feature/session-id-blinding-part-2 2022-03-29 09:15:32 +11:00
File Server Finalised the OpenGroupAPI and more tests 2022-03-15 15:19:23 +11:00
Jobs Reverted a change to the type for the serverId of a TSAttachment (change didn't match the protobuf) 2022-03-21 11:08:21 +11:00
Messages Merge branch 'dev' into feature/session-id-blinding-part-2 2022-03-29 09:15:32 +11:00
Meta Updated the code to cache the retrieval of the user public key 2022-03-15 16:06:53 +11:00
Open Groups Merge branch 'dev' into feature/session-id-blinding-part-2 2022-03-29 09:15:32 +11:00
Protos Removed 'publicKey' from the MessageRequestResponse and updated logic to use 'message.sender' isntead 2022-02-11 10:47:27 +11:00
Sending & Receiving Merge branch 'dev' into feature/session-id-blinding-part-2 2022-03-29 09:15:32 +11:00
Threads Merge branch 'dev' into feature/session-id-blinding-part-2 2022-03-15 15:22:36 +11:00
To Do Fully switch to the new contact API 2021-07-22 14:41:27 +10:00
Utilities Merge branch 'dev' into feature/session-id-blinding-part-2 2022-03-29 09:15:32 +11:00
Configuration.swift Redesign conversation screen part 1 2021-02-09 15:14:18 +11:00
IdentityManagerProtocol.swift Added more unit tests for the OpenGroupManager 2022-03-17 12:05:04 +11:00
Storage.swift Merge branch 'dev' into feature/session-id-blinding-part-2 2022-03-29 09:15:32 +11:00