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/Meta
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
..
AudioFiles add silence audio file 2022-08-17 14:19:14 +10:00
Certificates Updated the certificate for seed3 2023-05-18 08:50:03 +10:00
Countries Improve onion request path loading efficiency 2021-01-27 16:14:35 +11:00
Fonts Fix missing font 2021-05-25 09:04:22 +10:00
Images.xcassets Merge pull request #851 from mpretty-cyro/feature/updated-profile-picture-modal 2023-05-18 15:23:11 +10:00
Mnemonic Debug 2020-11-12 13:54:59 +11:00
Settings.bundle Merge remote-tracking branch 'upstream/dev' into feature/drop-yap-database-support 2023-08-30 13:40:02 +10:00
Translations Added additional new disappearing messages strings 2023-09-22 16:30:55 +10:00
TurnServers add session turn server info 2022-04-26 10:57:01 +10:00
AppDelegate.swift Fixed build errors and cleaned up Dependencies interface further 2023-09-19 18:13:37 +10:00
AppEnvironment.swift Fixed a few more PN logic issues 2023-08-10 14:43:40 +10:00
Launch Screen.storyboard Updated the app settings screens 2022-08-17 10:51:14 +10:00
MainAppContext.swift Fixed build errors and cleaned up Dependencies interface further 2023-09-19 18:13:37 +10:00
Session-Info.plist clean 2023-08-10 10:01:19 +10:00
SessionApp.swift Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 2023-09-26 11:32:03 +10:00
Signal-Bridging-Header.h Merge branch 'dev' into disappearing-message-redesign 2023-08-14 11:08:04 +10:00
Signal.entitlements Removed the iCloud entitlements 2023-04-17 08:44:09 +10:00
SignalTSan.supp Organize files 2020-11-12 08:48:41 +11:00
SignalUBSan.supp Organize files 2020-11-12 08:48:41 +11:00