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 e768bebe6d Merge remote-tracking branch 'upstream/dev' into feature/job-runner-unit-tests 
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Meta/Session-Prefix.pch
#	Session/Notifications/SyncPushTokensJob.swift
#	Session/Utilities/BackgroundPoller.swift
#	SessionMessagingKit/Configuration.swift
#	SessionMessagingKit/Database/Models/Profile.swift
#	SessionMessagingKit/Jobs/Types/AttachmentDownloadJob.swift
#	SessionMessagingKit/Jobs/Types/AttachmentUploadJob.swift
#	SessionMessagingKit/Jobs/Types/DisappearingMessagesJob.swift
#	SessionMessagingKit/Jobs/Types/FailedAttachmentDownloadsJob.swift
#	SessionMessagingKit/Jobs/Types/FailedMessageSendsJob.swift
#	SessionMessagingKit/Jobs/Types/GroupLeavingJob.swift
#	SessionMessagingKit/Jobs/Types/MessageReceiveJob.swift
#	SessionMessagingKit/Jobs/Types/MessageSendJob.swift
#	SessionMessagingKit/Jobs/Types/NotifyPushServerJob.swift
#	SessionMessagingKit/Jobs/Types/RetrieveDefaultOpenGroupRoomsJob.swift
#	SessionMessagingKit/Jobs/Types/SendReadReceiptsJob.swift
#	SessionMessagingKit/Jobs/Types/UpdateProfilePictureJob.swift
#	SessionMessagingKit/Sending & Receiving/MessageSender.swift
#	SessionMessagingKit/Sending & Receiving/Pollers/ClosedGroupPoller.swift
#	SessionMessagingKit/Utilities/AppReadiness.m
#	SessionMessagingKitTests/Open Groups/OpenGroupManagerSpec.swift
#	SessionMessagingKitTests/_TestUtilities/TestOnionRequestAPI.swift
#	SessionShareExtension/ShareNavController.swift
#	SessionSnodeKit/Jobs/GetSnodePoolJob.swift
#	SessionUtilitiesKit/Configuration.swift
#	SessionUtilitiesKit/Database/Utilities/Database+Utilities.swift
#	SessionUtilitiesKit/JobRunner/JobRunner.swift
#	SignalUtilitiesKit/Meta/SignalUtilitiesKit.h
#	SignalUtilitiesKit/Utilities/SSKAsserts.h
 		2023-07-18 10:02:51 +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 Further refactoring work 2022-12-07 15:54:17 +11:00
Translations Fixed up the remaining reported internal testing issues 2023-06-28 18:03:40 +10:00
TurnServers add session turn server info 2022-04-26 10:57:01 +10:00
AppDelegate.swift Merge remote-tracking branch 'upstream/dev' into feature/job-runner-unit-tests 2023-07-18 10:02:51 +10:00
AppEnvironment.swift Merge remote-tracking branch 'upstream/dev' into feature/job-runner-unit-tests 2023-07-18 10:02:51 +10:00
Launch Screen.storyboard Updated the app settings screens 2022-08-17 10:51:14 +10:00
MainAppContext.h Fixed a few more threading-related bugs 2023-06-30 17:59:37 +10:00
MainAppContext.m Merge remote-tracking branch 'upstream/dev' into feature/job-runner-unit-tests 2023-07-18 10:02:51 +10:00
Session-Info.plist Changed the submodule to be via HTTPS instead of SSH 2023-07-12 15:28:28 +10:00
SessionApp.swift Moved some logic outside of DBWrite closures to prevent hangs 2023-07-07 13:20:32 +10:00
Signal-Bridging-Header.h Fixed a hang, removed redundant libs, files and code 2023-06-29 16:58:23 +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