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		2022-02-28 10:46:45 +11:00
..
AccountManager.swift	Re-organize files	2021-01-12 11:05:52 +11:00
AppUpdateNag.swift	Fix various warnings	2021-01-21 16:43:55 +11:00
AvatarViewHelper.h	Re-organize files	2021-01-12 11:05:52 +11:00
AvatarViewHelper.m	Fix document picker appearance	2021-02-17 10:14:48 +11:00
AVAudioSession+OWS.h	Re-organize files	2021-01-12 11:05:52 +11:00
AVAudioSession+OWS.m	Re-organize files	2021-01-12 11:05:52 +11:00
BackgroundPoller.swift	Additional encryption work on id blinding	2022-02-17 18:33:23 +11:00
CGRect+Utilities.swift	Organize files	2020-11-12 08:48:41 +11:00
ContactUtilities.swift	Built out the Message Request functionality	2022-02-02 16:59:56 +11:00
DateUtil.h	Improve date breaks between messages to be consistent with desktop	2021-09-02 14:18:01 +10:00
DateUtil.m	Improve date breaks between messages to be consistent with desktop	2021-09-02 14:18:01 +10:00
HapticFeedback.swift	Remove legacy notifications adaptee	2021-02-23 15:38:55 +11:00
IP2Country.swift	fix threading issue	2021-09-14 13:33:27 +10:00
KeyPairGeneration.swift	Organize files	2020-11-12 08:48:41 +11:00
KeyPairUtilities.swift	Add Session ID change notice	2020-12-07 16:27:29 +11:00
MentionUtilities.swift	Additional encryption work on id blinding	2022-02-17 18:33:23 +11:00
MessageRecipientStatusUtils.swift	Re-organize files	2021-01-12 11:05:52 +11:00
MockDataGenerator.swift	Updated a couple of comments	2022-02-22 15:52:30 +11:00
OWSOrphanDataCleaner.h	Re-organize files	2021-01-12 11:05:52 +11:00
OWSOrphanDataCleaner.m	Re-organize files	2021-01-12 11:05:52 +11:00
QRCode.swift	Organize files	2020-11-12 08:48:41 +11:00
SNAppearance.swift	Fix document picker appearance	2021-02-17 10:14:48 +11:00
TextFieldHelper.swift	Re-organize files	2021-01-12 11:05:52 +11:00
UIAlerts+iOS9.m	Re-organize files	2021-01-12 11:05:52 +11:00
UIApplication+OWS.swift	Re-organize files	2021-01-12 11:05:52 +11:00
UIImage+Scaling.swift	Organize files	2020-11-12 08:48:41 +11:00
UILabel+Interaction.swift	Organize files	2020-11-12 08:48:41 +11:00
UIResponder+OWS.swift	Re-organize files	2021-01-12 11:05:52 +11:00
UIStoryboard+OWS.swift	Re-organize files	2021-01-12 11:05:52 +11:00
UIView+Glow.swift	Organize files	2020-11-12 08:48:41 +11:00
UIView+Wrapping.swift	Organize files	2020-11-12 08:48:41 +11:00
UIViewController+CameraPermissions.h	Re-organize files	2021-01-12 11:05:52 +11:00
UIViewController+Permissions.h	Re-organize files	2021-01-12 11:05:52 +11:00
UIViewController+Permissions.m	Re-organize files	2021-01-12 11:05:52 +11:00