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 d9a64e0148 Merge remote-tracking branch 'upstream/dev' into standardised-strings
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Closed Groups/EditClosedGroupVC.swift
#	Session/Closed Groups/NewClosedGroupVC.swift
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/ConversationVC.swift
#	Session/Conversations/Emoji Picker/EmojiPickerCollectionView.swift
#	Session/Conversations/Settings/ThreadSettingsViewModel.swift
#	Session/Emoji/Emoji+Available.swift
#	Session/Home/New Conversation/NewDMVC.swift
#	Session/Media Viewing & Editing/GIFs/GifPickerViewController.swift
#	Session/Meta/AppDelegate.swift
#	Session/Meta/SessionApp.swift
#	Session/Onboarding/PNModeVC.swift
#	Session/Path/PathVC.swift
#	Session/Utilities/IP2Country.swift
#	SessionMessagingKit/Messages/Control Messages/SharedConfigMessage.swift
#	SessionMessagingKit/Sending & Receiving/Pollers/OpenGroupPoller.swift
#	SessionMessagingKit/Sending & Receiving/Pollers/Poller.swift
#	SessionNotificationServiceExtension/NotificationError.swift
#	SessionUIKit/Style Guide/Values.swift
#	SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentCaptionToolbar.swift
2 years ago
..
Types Fixed the background crash issues 2 years ago
Views Merge branch 'dev' into onboarding 2 years ago
BaseVC.swift fix gradient background 3 years ago
BezierPathView.swift WIP: refactor BezierPathView with swiftUI 2 years ago
CaptionView.swift Fixed a few more PN logic issues 2 years ago
FullConversationCell.swift Merge branch 'onboarding' into standardised-strings 2 years ago
LoadingIndicatorView.swift minor change of swiftui preview syntax for CI 2 years ago
LoadingViewController.swift WIP: Replace strings 2 years ago
OWSBezierPathView.h Fixed a hang, removed redundant libs, files and code 2 years ago
OWSBezierPathView.m Further config util logic 3 years ago
QRCodeScanningViewController.swift WIP: scan qr code screen 2 years ago
ScanQRCodeScreen.swift minor refactor on getting app name 2 years ago
ScanQRCodeWrapperVC.swift make things compile 2 years ago
ScreenLockUI.swift update more localized strings 2 years ago
SessionCarouselView+Info.swift optimise round corner for carousel view 3 years ago
SessionCarouselView+SwiftUI.swift Merge branch 'dev' into onboarding 2 years ago
SessionCarouselView.swift implement carousel view delegate 3 years ago
SessionCarouselViewDelegate.swift implement carousel view delegate 3 years ago
SessionHostingViewController.swift Merge branch 'dev' into onboarding 2 years ago
SessionTableViewController.swift update more localized strings 2 years ago
SessionTableViewModel.swift Fixed a crash on the blocked contacts screen and refactoring 2 years ago
SessionTableViewTitleView.swift Fixed a number of bugs found in the internal release 2 years ago
UserSelectionVC.swift Fixed an accessibility regression 3 years ago