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 a1e88329db Merge branch 'dev' into feature/theming
# Conflicts:
#	Podfile.lock
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/Message Cells/VisibleMessageCell.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/Notifications/AppNotifications.swift
#	SessionMessagingKit/Shared Models/MessageViewModel.swift
#	SessionMessagingKit/Shared Models/SessionThreadViewModel.swift
#	SignalUtilitiesKit/Profile Pictures/ProfilePictureView.swift
3 years ago
..
BaseVC.swift Updated the colours to source from direct theme values (instead of individual) 3 years ago
CaptionView.swift Applied the "increase min version to iOS 13" changes 3 years ago
DismissableTextField.swift Removed a bunch of unused code 3 years ago
FullConversationCell.swift Merge branch 'dev' into feature/theming 3 years ago
LoadingViewController.swift Applied theming to a number of screens, some minor cleanup and bug fixes 3 years ago
MarqueeLabel.swift Applied the "increase min version to iOS 13" changes 3 years ago
NeverClearView.swift Re-organize files 4 years ago
OWSBezierPathView.h Re-organize files 4 years ago
OWSBezierPathView.m Re-organize files 4 years ago
OWSProgressView.h Re-organize files 4 years ago
OWSProgressView.m Re-organize files 4 years ago
OWSQRCodeScanningViewController.h Re-organize files 4 years ago
OWSQRCodeScanningViewController.m Re-organize files 4 years ago
ReminderView.swift Removed a bunch of unused code 3 years ago
ScanQRCodeWrapperVC.swift Applied theming to a number of screens, some minor cleanup and bug fixes 3 years ago
ScreenLockUI.swift Updated the colours to source from direct theme values (instead of individual) 3 years ago
UserCell.swift tweak: if current user reacts then their username should appear as ‘You’ 3 years ago
UserSelectionVC.swift Applied theming to a number of screens, some minor cleanup and bug fixes 3 years ago