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 |
Morgan Pretty
|
851cc56c65
|
Fixed a couple of bugs with the emoji picker and context menu
Cleaned up the context menu appearance and the message timestamp appearing off screen issue
Fixed an issue with keyboard avoidance on the emoji picker
|
2022-09-15 13:56:32 +10:00 |
Ryan Zhao
|
bd0614532e
|
feat: add cancel button for emoji search bar
|
2022-09-01 11:40:34 +10:00 |
Ryan Zhao
|
e5a46a993d
|
update emoji names for searching
|
2022-09-01 11:23:50 +10:00 |
Morgan Pretty
|
c25f378c54
|
Merge branch 'feature/database-refactor' into emoji-reacts
# Conflicts:
# Session.xcodeproj/project.pbxproj
# Session/Conversations/Context Menu/ContextMenuVC+Action.swift
# Session/Conversations/Context Menu/ContextMenuVC+ActionView.swift
# Session/Conversations/Context Menu/ContextMenuVC.swift
# Session/Conversations/ConversationVC+Interaction.swift
# Session/Conversations/ConversationVC.swift
# Session/Conversations/ConversationViewItem.h
# Session/Conversations/ConversationViewItem.m
# Session/Conversations/Message Cells/Content Views/LinkPreviewView.swift
# Session/Conversations/Message Cells/MessageCell.swift
# Session/Conversations/Message Cells/VisibleMessageCell.swift
# Session/Conversations/Views & Modals/BodyTextView.swift
# Session/Meta/Translations/en.lproj/Localizable.strings
# Session/Shared/UserCell.swift
# SessionMessagingKit/Jobs/MessageSendJob.swift
# SessionMessagingKit/Messages/Signal/TSMessage.h
# SessionMessagingKit/Messages/Signal/TSMessage.m
# SessionMessagingKit/Messages/Visible Messages/VisibleMessage.swift
# SessionMessagingKit/Open Groups/OpenGroupAPIV2.swift
# SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift
# SessionMessagingKit/Sending & Receiving/Notifications/NotificationsProtocol.h
# SessionMessagingKit/Sending & Receiving/Pollers/OpenGroupPollerV2.swift
# SessionMessagingKit/Utilities/General.swift
# SessionNotificationServiceExtension/NSENotificationPresenter.swift
# SignalUtilitiesKit/Utilities/DisplayableText.swift
# SignalUtilitiesKit/Utilities/NoopNotificationsManager.swift
# SignalUtilitiesKit/Utilities/Notification+Loki.swift
|
2022-07-25 15:39:56 +10:00 |
Ryan Zhao
|
8fe2e2d1d9
|
ui: emoji picker background color fix
|
2022-06-20 11:12:21 +10:00 |
Ryan Zhao
|
913939616e
|
feat: emoji picker view
|
2022-06-14 15:11:17 +10:00 |