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/Settings
Morgan Pretty 742c4a161f Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/ConversationViewModel.swift
#	Session/Media Viewing & Editing/GIFs/GifPickerViewController.swift
#	Session/Media Viewing & Editing/GIFs/GiphyAPI.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
#	Session/Notifications/SyncPushTokensJob.swift
#	Session/Notifications/UserNotificationsAdaptee.swift
#	SessionMessagingKit/Configuration.swift
#	SessionMessagingKit/Database/Models/Interaction.swift
#	SessionMessagingKit/Database/Models/SessionThread.swift
#	SessionMessagingKit/Jobs/Types/MessageReceiveJob.swift
#	SessionMessagingKit/Jobs/Types/MessageSendJob.swift
#	SessionMessagingKit/Jobs/Types/SendReadReceiptsJob.swift
#	SessionMessagingKit/Messages/Message.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ReadReceipts.swift
#	SessionMessagingKit/Sending & Receiving/MessageSender+Convenience.swift
#	SessionMessagingKit/Sending & Receiving/MessageSender.swift
#	SessionMessagingKit/Shared Models/MentionInfo.swift
2 years ago
..
Views Added in missing code changes unrelated to closed groups rebuild 2 years ago
AppearanceViewController.swift Translations, better RTL support and minor animation fix 3 years ago
BlockedContactsViewModel.swift Sorted out a bunch of the config syncing logic 2 years ago
ConversationSettingsViewModel.swift Added in missing code changes unrelated to closed groups rebuild 2 years ago
HelpViewModel.swift Updated to the latest version of libSession-util 2 years ago
ImagePickerHandler.swift Sorted out a bunch of the config syncing logic 2 years ago
NotificationContentViewModel.swift Added in missing code changes unrelated to closed groups rebuild 2 years ago
NotificationSettingsViewModel.swift Added in missing code changes unrelated to closed groups rebuild 2 years ago
NotificationSoundViewModel.swift Added in missing code changes unrelated to closed groups rebuild 2 years ago
NukeDataModal.swift Sorted out a bunch of the config syncing logic 2 years ago
PrivacySettingsViewModel.swift Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2 years ago
QRCodeVC.swift Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2 years ago
SeedModal.swift Cleaned up the config-based table view controller to be more reusable 3 years ago
SettingsViewModel.swift Fixed build issues, bugs, added unit tests and added the ConvoInfoVolatile handling 2 years ago