session-ios/SessionMessagingKit
Morgan Pretty 1bc6b0bdba Merge remote-tracking branch 'upstream/dev' into feature/theming
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/ConversationVC.swift
#	Session/Conversations/ConversationViewModel.swift
#	Session/Conversations/Message Cells/VisibleMessageCell.swift
#	Session/Home/HomeVC.swift
#	Session/Home/Message Requests/MessageRequestsViewController.swift
#	Session/Media Viewing & Editing/MediaTileViewController.swift
#	Session/Meta/AppDelegate.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
#	Session/Onboarding/LandingVC.swift
#	SessionMessagingKitTests/_TestUtilities/MockGeneralCache.swift
2022-09-15 14:22:11 +10:00
..
Calls fix a case when the app goes into background with an ongoing call 2022-09-02 16:59:50 +10:00
Common Networking tweak: add update types of reaction to query parameter 2022-08-11 14:50:31 +10:00
Database Merge remote-tracking branch 'upstream/dev' into feature/theming 2022-09-15 14:22:11 +10:00
File Server Fixed a few bugs with media attachment handling, added webp support 2022-07-29 15:26:24 +10:00
Jobs/Types Fixed a couple of bugs and did some more theming 2022-09-13 17:57:13 +10:00
Messages Merge remote-tracking branch 'upstream/dev' into feature/theming 2022-09-15 14:22:11 +10:00
Meta A few bugs fixes and some optimisations 2022-08-19 16:58:47 +10:00
Open Groups tweak: make seqNo optional 2022-08-31 16:38:25 +10:00
Protos wip: emoji reacts message cell ui 2022-05-18 17:19:11 +10:00
Sending & Receiving Merge remote-tracking branch 'upstream/dev' into feature/theming 2022-09-15 14:22:11 +10:00
Shared Models Did some more styling and fixed a few UI bugs 2022-09-14 18:32:23 +10:00
Utilities Merge remote-tracking branch 'upstream/dev' into feature/theming 2022-09-15 14:22:11 +10:00
Configuration.swift Fixed search performance, started styling in-conversaiton settings 2022-09-07 17:37:01 +10:00