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/Messages/Control Messages
Morgan Pretty 3e97782d18 Merge branch 'dev' into feature/session-id-blinding-part-2
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/ConversationVC.swift
#	Session/Meta/Translations/de.lproj/Localizable.strings
#	Session/Meta/Translations/en.lproj/Localizable.strings
#	Session/Meta/Translations/es.lproj/Localizable.strings
#	Session/Meta/Translations/fa.lproj/Localizable.strings
#	Session/Meta/Translations/fi.lproj/Localizable.strings
#	Session/Meta/Translations/fr.lproj/Localizable.strings
#	Session/Meta/Translations/hi.lproj/Localizable.strings
#	Session/Meta/Translations/hr.lproj/Localizable.strings
#	Session/Meta/Translations/id-ID.lproj/Localizable.strings
#	Session/Meta/Translations/it.lproj/Localizable.strings
#	Session/Meta/Translations/ja.lproj/Localizable.strings
#	Session/Meta/Translations/nl.lproj/Localizable.strings
#	Session/Meta/Translations/pl.lproj/Localizable.strings
#	Session/Meta/Translations/pt_BR.lproj/Localizable.strings
#	Session/Meta/Translations/ru.lproj/Localizable.strings
#	Session/Meta/Translations/si.lproj/Localizable.strings
#	Session/Meta/Translations/sk.lproj/Localizable.strings
#	Session/Meta/Translations/sv.lproj/Localizable.strings
#	Session/Meta/Translations/th.lproj/Localizable.strings
#	Session/Meta/Translations/vi-VN.lproj/Localizable.strings
#	Session/Meta/Translations/zh-Hant.lproj/Localizable.strings
#	Session/Meta/Translations/zh_CN.lproj/Localizable.strings
4 years ago
..
ClosedGroupControlMessage.swift Updated the code to support additional session id prefixes 4 years ago
ConfigurationMessage+Convenience.swift Merge branch 'dev' into feature/session-id-blinding-part-2 4 years ago
ConfigurationMessage.swift Added a notification to indicate the user has a new message request 4 years ago
ControlMessage.swift Redesign conversation screen part 1 5 years ago
DataExtractionNotification.swift Create DataExtractionNotification 5 years ago
ExpirationTimerUpdate.swift Implement open group invitations UI 5 years ago
MessageRequestResponse.swift Removed 'publicKey' from the MessageRequestResponse and updated logic to use 'message.sender' isntead 4 years ago
ReadReceipt.swift Set group context 5 years ago
TypingIndicator.swift Debug & make UI clearer 5 years ago
UnsendRequest.swift make it work for multi device 4 years ago