Morgan Pretty c415fc9e06 Merge branch 'dev' into feature/session-id-blinding-part-2 ... # Conflicts: # Session/Open Groups/OpenGroupSuggestionGrid.swift # SessionMessagingKit/Open Groups/OpenGroupAPIV2+ObjC.swift # SessionMessagingKit/Open Groups/OpenGroupAPIV2.swift # SessionMessagingKit/Open Groups/OpenGroupManagerV2.swift		2022-03-11 17:15:55 +11:00
..
Notification+Contacts.swift	Implement nicknames	2021-03-01 13:15:54 +11:00
OWSBackupFragment.h	Make things compile again	2020-11-26 10:37:56 +11:00
OWSBackupFragment.m	Make things compile again	2020-11-26 10:37:56 +11:00
OWSPrimaryStorage.h	Restructure	2020-11-25 16:15:16 +11:00
OWSPrimaryStorage.m	fix unread mention indicator showing after the message is deleted	2022-03-11 11:43:21 +11:00
OWSStorage+Subclass.h	Make things compile again	2020-11-26 10:37:56 +11:00
OWSStorage.h	Restructure	2020-11-25 16:15:16 +11:00
OWSStorage.m	Add missing strings	2021-05-05 13:18:45 +10:00
SSKPreferences.swift	Restructure	2020-11-25 16:15:16 +11:00
Storage+ClosedGroups.swift	Add missing strings	2021-05-05 13:18:45 +10:00
Storage+Contacts.swift	Code cleanup and database transaction tweaks	2022-03-04 18:02:38 +11:00
Storage+Jobs.swift	File upload working, further code cleanup	2022-03-04 13:33:06 +11:00
Storage+Messaging.swift	Further work on Id Blinding	2022-03-01 14:06:37 +11:00
Storage+OpenGroups.swift	Refactored the mocking code to use a better convention which also allows for call validation	2022-03-11 16:57:28 +11:00
Storage+Shared.swift	fix nested transaction crash	2021-09-30 09:30:30 +10:00
TSDatabaseSecondaryIndexes.h	Restructure	2020-11-25 16:15:16 +11:00
TSDatabaseSecondaryIndexes.m	Restructure	2020-11-25 16:15:16 +11:00
TSDatabaseView.h	fix unread mention indicator showing after the message is deleted	2022-03-11 11:43:21 +11:00
TSDatabaseView.m	fix unread mention indicator showing after the message is deleted	2022-03-11 11:43:21 +11:00