oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
session-ios/Session/Conversations
History
Morgan Pretty 534343f8b0 Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 
# Conflicts:
#	Session/Closed Groups/NewClosedGroupVC.swift
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/ConversationVC.swift
#	Session/Conversations/ConversationViewModel.swift
#	Session/Conversations/Settings/ThreadSettingsViewModel.swift
#	Session/Home/GlobalSearch/GlobalSearchViewController.swift
#	Session/Home/HomeVC.swift
#	Session/Home/New Conversation/NewDMVC.swift
#	Session/Media Viewing & Editing/GIFs/GifPickerViewController.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/Settings/BlockedContactsViewController.swift
#	Session/Settings/NukeDataModal.swift
#	Session/Settings/SettingsViewModel.swift
#	SessionMessagingKit/Shared Models/SessionThreadViewModel.swift
#	SessionUIKit/Components/ConfirmationModal.swift
 		2023-05-18 17:34:25 +10:00
..
Context Menu Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2023-04-13 13:22:39 +10:00
Emoji Picker Fixed the broken tests and resolved some warnings 2022-12-07 16:05:32 +11:00
Input View Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2023-05-18 17:34:25 +10:00
Message Cells Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2023-05-18 17:34:25 +10:00
Settings Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2023-05-18 17:34:25 +10:00
Views & Modals Fixed issues found during QA 2023-04-14 18:19:18 +10:00
ConversationSearch.swift Made a few small bug fixes & improvements 2023-03-09 15:46:45 +11:00
ConversationVC+Interaction.swift Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2023-05-18 17:34:25 +10:00
ConversationVC.swift Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2023-05-18 17:34:25 +10:00
ConversationViewModel.swift Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2023-05-18 17:34:25 +10:00