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/Utilities
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
11 months ago
..
BackgroundPoller.swift [WIP] Cleaned up interface, error handling and redundant code 1 year ago
CGRect+Utilities.swift Work on the PromiseKit refactor 2 years ago
Date+Utilities.swift Merge branch 'dev' into standardised-strings 1 year ago
DifferenceKit+Utilities.swift Merge branch 'feature/database-refactor' into emoji-reacts 3 years ago
HapticFeedback.swift Applied the "increase min version to iOS 13" changes 3 years ago
IP2Country.swift Merge remote-tracking branch 'upstream/dev' into standardised-strings 11 months ago
MentionUtilities.swift update strings 1 year ago
MockDataGenerator.swift Refactored the LintLocalizableStrings 2 years ago
Permissions.swift minor refactor on getting app name 12 months ago
QRCode.swift Merge branch 'onboarding' into standardised-strings 12 months ago
TextFieldHelper.swift Re-organize files 4 years ago
TraitObservingWindow.swift Did some more theming, removed some files and fixed a couple of minor call issues 3 years ago
UIApplication+OWS.swift Refactored AppContext and AppRediness to Swift 1 year ago
UIContextualAction+Utilities.swift rename dynamic variables in strings 12 months ago
UIImage+Scaling.swift Organize files 4 years ago
UILabel+Interaction.swift Organize files 4 years ago
UINavigationBar+Utilities.swift Finished removing usages to non-theme colour variables 3 years ago
UIResponder+OWS.swift Re-organize files 4 years ago
UIScrollView+Utilities.swift Got paging working on the conversation screen 3 years ago
UIStoryboard+OWS.swift Re-organize files 4 years ago
UIView+Draggable.swift Did some more theming, removed some files and fixed a couple of minor call issues 3 years ago
UIView+Wrapping.swift Merge remote-tracking branch 'upstream/dev' into feature/theming 3 years ago