Morgan Pretty 8109a326cf Merge remote-tracking branch 'upstream/dev' into feature/theming ... # Conflicts: # Session.xcodeproj/project.pbxproj # Session/Closed Groups/NewClosedGroupVC.swift # Session/Conversations/ConversationVC+Interaction.swift # Session/Conversations/Message Cells/CallMessageCell.swift # Session/Conversations/Views & Modals/JoinOpenGroupModal.swift # Session/Home/HomeVC.swift # Session/Home/New Conversation/NewDMVC.swift # Session/Home/NewConversationButtonSet.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/Open Groups/JoinOpenGroupVC.swift # Session/Open Groups/OpenGroupSuggestionGrid.swift # Session/Settings/SettingsVC.swift # Session/Shared/BaseVC.swift # Session/Shared/OWSQRCodeScanningViewController.m # Session/Shared/ScanQRCodeWrapperVC.swift # Session/Shared/UserCell.swift # SessionMessagingKit/Configuration.swift # SessionShareExtension/SAEScreenLockViewController.swift # SessionUIKit/Style Guide/Gradients.swift # SignalUtilitiesKit/Media Viewing & Editing/OWSViewController+ImageEditor.swift # SignalUtilitiesKit/Screen Lock/ScreenLockViewController.m		2022-09-26 11:16:47 +10:00
..
Views	Finished removing usages to non-theme colour variables	2022-09-20 16:06:01 +10:00
AppearanceViewController.swift	Progressing on theming functionality	2022-08-12 13:35:17 +10:00
BlockedContactsViewController.swift	Merge remote-tracking branch 'upstream/dev' into feature/theming	2022-09-26 11:16:47 +10:00
BlockedContactsViewModel.swift	Finished off the updated settings sections and fixed a couple of bugs	2022-08-26 14:09:41 +10:00
ConversationSettingsViewModel.swift	Started refactoring the conversation image picker screens	2022-09-08 11:22:36 +10:00
HelpViewModel.swift	Started refactoring the conversation image picker screens	2022-09-08 11:22:36 +10:00
NotificationContentViewModel.swift	Fixed a couple of bugs and did some more theming	2022-09-13 17:57:13 +10:00
NotificationSettingsViewModel.swift	Merge remote-tracking branch 'upstream/dev' into feature/theming	2022-09-26 11:16:47 +10:00
NotificationSoundViewModel.swift	Started refactoring the conversation image picker screens	2022-09-08 11:22:36 +10:00
NukeDataModal.swift	Updated some more message types and modals	2022-08-31 17:44:44 +10:00
PrivacySettingsViewModel.swift	Started refactoring the conversation image picker screens	2022-09-08 11:22:36 +10:00
QRCodeVC.swift	Merge remote-tracking branch 'upstream/dev' into feature/theming	2022-09-26 11:16:47 +10:00
SeedModal.swift	Finished off the updated settings sections and fixed a couple of bugs	2022-08-26 14:09:41 +10:00
SettingsTableViewController.swift	Finished removing usages to non-theme colour variables	2022-09-20 16:06:01 +10:00
SettingsTableViewModel.swift	Started refactoring the conversation image picker screens	2022-09-08 11:22:36 +10:00
SettingsVC.swift	update grey background color	2022-09-12 13:10:51 +10:00