oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
session-ios/Session
History
Morgan Pretty 96b5403726 Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/Settings/ThreadSettingsViewModel.swift
#	Session/Meta/Translations/de.lproj/Localizable.strings
#	Session/Meta/Translations/en.lproj/Localizable.strings
#	Session/Meta/Translations/es-ES.lproj/Localizable.strings
#	Session/Meta/Translations/fa.lproj/Localizable.strings
#	Session/Meta/Translations/fi.lproj/Localizable.strings
#	Session/Meta/Translations/fil.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/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/sk.lproj/Localizable.strings
#	Session/Meta/Translations/sl.lproj/Localizable.strings
#	Session/Meta/Translations/sv-SE.lproj/Localizable.strings
#	Session/Meta/Translations/th.lproj/Localizable.strings
#	Session/Meta/Translations/vi.lproj/Localizable.strings
#	Session/Meta/Translations/zh-CN.lproj/Localizable.strings
#	Session/Meta/Translations/zh-TW.lproj/Localizable.strings
#	SessionMessagingKit/Calls/WebRTCSession.swift
#	SessionMessagingKit/Configuration.swift
#	SessionMessagingKit/Database/Migrations/_003_YDBToGRDBMigration.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+VisibleMessages.swift
#	SessionMessagingKit/SessionUtil/Config Handling/SessionUtil+Contacts.swift
#	SessionMessagingKit/Utilities/ProfileManager.swift
#	SessionMessagingKitTests/Jobs/Types/MessageSendJobSpec.swift
#	SessionMessagingKitTests/LibSessionUtil/LibSessionSpec.swift
#	SessionMessagingKitTests/LibSessionUtil/SessionUtilSpec.swift
#	SessionMessagingKitTests/Open Groups/Models/BatchRequestInfoSpec.swift
#	SessionMessagingKitTests/Open Groups/Models/SOGSMessageSpec.swift
#	SessionMessagingKitTests/Open Groups/OpenGroupAPISpec.swift
#	SessionMessagingKitTests/Open Groups/OpenGroupManagerSpec.swift
#	SessionMessagingKitTests/Open Groups/Types/SOGSEndpointSpec.swift
#	SessionMessagingKitTests/Sending & Receiving/MessageReceiverDecryptionSpec.swift
#	SessionMessagingKitTests/Sending & Receiving/MessageSenderEncryptionSpec.swift
#	SessionMessagingKitTests/Shared Models/SessionThreadViewModelSpec.swift
#	SessionMessagingKitTests/Utilities/CryptoSMKSpec.swift
#	SessionTests/Conversations/Settings/ThreadDisappearingMessagesViewModelSpec.swift
#	SessionTests/Conversations/Settings/ThreadSettingsViewModelSpec.swift
#	SessionTests/Settings/NotificationContentViewModelSpec.swift
#	SessionUtilitiesKitTests/Database/Models/IdentitySpec.swift
#	SessionUtilitiesKitTests/Database/Utilities/PersistableRecordUtilitiesSpec.swift
#	SessionUtilitiesKitTests/General/DependenciesSpec.swift
#	SessionUtilitiesKitTests/JobRunner/JobRunnerSpec.swift
#	_SharedTestUtilities/MockCaches.swift
 		2023-09-26 11:32:03 +10:00
..
Backups Merge branch 'remove-unused-code' into voice-calls-2 2022-04-04 11:08:54 +10:00
Calls Fixed build errors and cleaned up Dependencies interface further 2023-09-19 18:13:37 +10:00
Closed Groups [WIP] Refactored dependency access to be more generic 2023-09-01 13:40:50 +10:00
Conversations Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 2023-09-26 11:32:03 +10:00
Dependencies Remove SwiftCSV 2021-01-27 14:09:19 +11:00
Emoji Fixed a couple more issues 2023-09-21 15:55:26 +10:00
Home [WIP] Refactored dependency access to be more generic 2023-09-01 13:40:50 +10:00
Media Viewing & Editing Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 2023-09-26 11:32:03 +10:00
Meta Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 2023-09-26 11:32:03 +10:00
Notifications Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 2023-09-26 11:32:03 +10:00
Onboarding Fixed build errors and cleaned up Dependencies interface further 2023-09-19 18:13:37 +10:00
Open Groups [WIP] Refactored dependency access to be more generic 2023-09-01 13:40:50 +10:00
Path [WIP] Refactored dependency access to be more generic 2023-09-01 13:40:50 +10:00
Settings Fixed build errors and cleaned up Dependencies interface further 2023-09-19 18:13:37 +10:00
Shared Fixed build errors and cleaned up Dependencies interface further 2023-09-19 18:13:37 +10:00
Utilities Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 2023-09-26 11:32:03 +10:00
.swiftlint.yml Fix target naming 2020-11-11 18:42:06 +11:00