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/Session/Shared
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
..
Types Fixed a crash on the blocked contacts screen and refactoring 2 years ago
Views Merge branch 'dev' into disappearing-message-redesign 2 years ago
BaseVC.swift fix gradient background 3 years ago
BezierPathView.swift WIP: refactor BezierPathView with swiftUI 3 years ago
CaptionView.swift Fixed a few more PN logic issues 2 years ago
FullConversationCell.swift Did some refactoring to better distinguish between publicKeys and sessionIds in the codebase 2 years ago
LoadingViewController.swift Removed some unneeded imports 3 years ago
OWSBezierPathView.h Fixed a hang, removed redundant libs, files and code 3 years ago
OWSBezierPathView.m Further config util logic 3 years ago
QRCodeScanningViewController.swift Include specific fixes from the other branch 3 years ago
ScanQRCodeWrapperVC.swift fix scan qr code screen 3 years ago
ScreenLockUI.swift Fixed build errors and cleaned up Dependencies interface further 2 years ago
SessionCarouselView+Info.swift optimise round corner for carousel view 3 years ago
SessionCarouselView.swift implement carousel view delegate 3 years ago
SessionCarouselViewDelegate.swift implement carousel view delegate 3 years ago
SessionTableViewController.swift Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 2 years ago
SessionTableViewModel.swift Fixed a crash on the blocked contacts screen and refactoring 2 years ago
SessionTableViewTitleView.swift minor ui adjustment 3 years ago
UserSelectionVC.swift Fixed an accessibility regression 3 years ago