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
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
2 years ago
..
Common Networking Added more unit tests 2 years ago
Contacts Added more unit tests for the OpenGroupManager 2 years ago
Database Merge branch 'dev' into feature/session-id-blinding-part-2 2 years ago
File Server Finalised the OpenGroupAPI and more tests 2 years ago
Jobs Reverted a change to the type for the serverId of a TSAttachment (change didn't match the protobuf) 2 years ago
Messages Merge branch 'dev' into feature/session-id-blinding-part-2 2 years ago
Meta Updated the code to cache the retrieval of the user public key 2 years ago
Open Groups Merge branch 'dev' into feature/session-id-blinding-part-2 2 years ago
Protos Removed 'publicKey' from the MessageRequestResponse and updated logic to use 'message.sender' isntead 2 years ago
Sending & Receiving Merge branch 'dev' into feature/session-id-blinding-part-2 2 years ago
Threads Merge branch 'dev' into feature/session-id-blinding-part-2 2 years ago
To Do Fully switch to the new contact API 3 years ago
Utilities Merge branch 'dev' into feature/session-id-blinding-part-2 2 years ago
Configuration.swift Redesign conversation screen part 1 4 years ago
IdentityManagerProtocol.swift Added more unit tests for the OpenGroupManager 2 years ago
Storage.swift Merge branch 'dev' into feature/session-id-blinding-part-2 2 years ago