You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
session-ios/SessionUIKit/Components
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
2 years ago
..
ConfirmationModal.swift Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2 years ago
GradientView.swift Merge remote-tracking branch 'upstream/dev' into feature/theming 3 years ago
HighlightMentionBackgroundView.swift Merge branch 'database-refactor' into emoji-reacts 3 years ago
Modal.swift Updated the profile picture management UI 2 years ago
RadioButton.swift Translations, better RTL support and minor animation fix 3 years ago
SearchBar.swift Merge remote-tracking branch 'upstream/dev' into feature/theming 3 years ago
Separator.swift Added in missing code changes unrelated to closed groups rebuild 3 years ago
SessionButton.swift Added in missing code changes unrelated to closed groups rebuild 3 years ago
StyledNavigationController.swift Fixed most of the styling issues raised during QA 3 years ago
TabBar.swift Updated the colours to source from direct theme values (instead of individual) 3 years ago
TappableLabel.swift Fixed an issue where Appium couldn't long press message bubbles 3 years ago
TextField.swift Merge remote-tracking branch 'upstream/dev' into feature/theming 3 years ago
TextView.swift Merge remote-tracking branch 'upstream/dev' into feature/theming 3 years ago
TopBannerController.swift Finished off a few remaining bits and pieces 3 years ago