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 5ac05a41ec Merge remote-tracking branch 'RyanFork/disappearing-message-redesign' into feature/groups-rebuild
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/ConversationViewModel.swift
#	Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
#	Session/Conversations/Settings/ThreadSettingsViewModel.swift
#	Session/Home/Message Requests/MessageRequestsViewController.swift
#	Session/Home/Message Requests/MessageRequestsViewModel.swift
#	Session/Meta/Translations/fil.lproj/Localizable.strings
#	Session/Meta/Translations/hi.lproj/Localizable.strings
#	Session/Meta/Translations/hr.lproj/Localizable.strings
#	Session/Meta/Translations/nl.lproj/Localizable.strings
#	Session/Meta/Translations/sl.lproj/Localizable.strings
#	Session/Meta/Translations/sv-SE.lproj/Localizable.strings
#	Session/Meta/Translations/th.lproj/Localizable.strings
#	Session/Meta/Translations/vi.lproj/Localizable.strings
#	Session/Meta/Translations/zh-TW.lproj/Localizable.strings
#	Session/Settings/ConversationSettingsViewModel.swift
#	Session/Settings/HelpViewModel.swift
#	Session/Settings/NotificationContentViewModel.swift
#	Session/Settings/NotificationSettingsViewModel.swift
#	Session/Settings/NotificationSoundViewModel.swift
#	Session/Settings/PrivacySettingsViewModel.swift
#	Session/Settings/SettingsViewModel.swift
#	Session/Shared/SessionTableViewController.swift
#	SessionSnodeKit/Database/Models/SnodeReceivedMessageInfo.swift
#	SessionTests/Settings/NotificationContentViewModelSpec.swift
#	SessionUIKit/Components/TopBannerController.swift
#	SessionUtilitiesKit/Configuration.swift
2 years ago
..
ConfirmationModal.swift Started working on some config contact pruning logic 2 years ago
GradientView.swift Merge remote-tracking branch 'upstream/dev' into feature/theming 3 years ago
HighlightMentionBackgroundView.swift Fixed a number of issues found during internal testing 2 years ago
Modal.swift Updated the profile picture management UI 2 years ago
PlaceholderIcon.swift Did some refactoring to better distinguish between publicKeys and sessionIds in the codebase 2 years ago
ProfilePictureView.swift Finished adding logic to ignore messages invalidated by config 2 years ago
RadioButton.swift add accessibility id for radio buttons 2 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 2 years ago
SessionButton.swift Fixed a crash on the blocked contacts screen and refactoring 2 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 2 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 Merge remote-tracking branch 'RyanFork/disappearing-message-redesign' into feature/groups-rebuild 2 years ago