Morgan Pretty 028ba0c77a Merge branch 'dev' into feature/message-requests ... # Conflicts: # 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-25 12:48:38 +11: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	Fixed bugs raised by QA	2022-02-17 16:29:14 +11:00
Message Cells	fix swiping to reply for very short messages	2022-02-16 13:17:56 +11:00
Settings	Disabled the disappearing message settings for the recipient of a message request as well	2022-02-24 16:29:06 +11:00
Views & Modals	Merge branch 'dev' into feature/message-requests	2022-02-04 11:49:54 +11:00
ConversationMessageMapping.swift	Clean	2021-02-19 16:02:19 +11:00
ConversationSearch.swift	Clean	2021-02-19 16:02:19 +11:00
ConversationVC+Interaction.swift	Fixed a few bugs uncovered by QA	2022-02-23 17:12:57 +11:00
ConversationVC.swift	Fixed a bug where the most recent message couldn't be interacted with due to message request UI changes	2022-02-22 11:42:11 +11:00
ConversationViewAction.h	Clean	2021-02-19 16:02:19 +11:00
ConversationViewItem.h	add flag to disable unsend request for now	2021-08-09 13:51:09 +10:00
ConversationViewItem.m	minor fix on debug mode to prevent crashing	2022-01-28 13:14:02 +11:00
ConversationViewModel.h	increase the max number of messages loaded	2021-09-10 09:12:13 +10:00
ConversationViewModel.m	Improve date breaks between messages to be consistent with desktop	2021-09-02 14:18:01 +10:00
LongTextViewController.swift	Clean	2021-02-19 16:02:19 +11:00