ryanzhao
							
						 
						
							 
							
							
							
								
							
								f988f272d1 
								
							
								 
							
						 
						
							
							
								
								WIP: show attachment full screen  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								66b94778e0 
								
							
								 
							
						 
						
							
							
								
								Fixed the build issues and a bug where a new legacy group wasn't subscribile  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								635a5182bc 
								
							
								 
							
						 
						
							
							
								
								Fixed a typo in the upload script  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								1b0fda56ad 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into feature/updated-push-server  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Meta/AppDelegate.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/Notifications/SyncPushTokensJob.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ClosedGroups.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageSender+ClosedGroups.swift
#	SessionShareExtension/ShareNavController.swift 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								2f05f3f3a2 
								
							
								 
							
						 
						
							
							
								
								Fixed a couple of invalid checks  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								715a5b583f 
								
							
								 
							
						 
						
							
							
								
								Fix a CI script typo  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								2341fbf59f 
								
							
								 
							
						 
						
							
							
								
								Further tweaks to CI scripts  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								00aef6ca97 
								
							
								 
							
						 
						
							
							
								
								Attempt to handle an invalid pod manifest file  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								15104da58e 
								
							
								 
							
						 
						
							
							
								
								More CI tweaks  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								c29827356c 
								
							
								 
							
						 
						
							
							
								
								Attempt to fix the cocoapods_cache lock logic to handle failures  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								b471a32209 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into feature/job-runner-unit-tests  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	Session/Conversations/ConversationVC+Interaction.swift
#	SessionMessagingKit/Open Groups/OpenGroupAPI.swift
#	SessionMessagingKit/Open Groups/OpenGroupManager.swift 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								a41f1c1366 
								
							
								 
							
						 
						
							
							
								
								Fixed the broken tests  
							
							 
							
							... 
							
							
							
							Cleaned up the Dependencies so that tests can run synchronously without having to custom set queues as much
Sorted out the crypto and network dependencies to avoid needing weird dependency inheritance
Fixed the flaky tests so they are no longer flaky
Fixed some unexpected JobRunner behaviours
Updated the CI config to use a local build directory for derivedData (now works with build tweaks) 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								bf3b870c8f 
								
							
								 
							
						 
						
							
							
								
								WIP: show full screen media gallery in message info screen  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								0a7900ca1b 
								
							
								 
							
						 
						
							
							
								
								fix date formatter  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								d5c448edac 
								
							
								 
							
						 
						
							
							
								
								wrap and use MediaView for message info screen  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								a5f12649c1 
								
							
								 
							
						 
						
							
							
								
								link real data  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								d91fd27260 
								
							
								 
							
						 
						
							
							
								
								WIP: link real data to swiftui message info screen  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								3ccf5995f2 
								
							
								 
							
						 
						
							
							
								
								add full screen button on message info screen  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								8e1e74b9c0 
								
							
								 
							
						 
						
							
							
								
								WIP: binding real infos  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								09bece5c10 
								
							
								 
							
						 
						
							
							
								
								add custom fonts to SwiftUI  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								1a22bd07ef 
								
							
								 
							
						 
						
							
							
								
								use theme color for message info screen  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								42578623d9 
								
							
								 
							
						 
						
							
							
								
								update theme for SwiftUI  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								0717beb117 
								
							
								 
							
						 
						
							
							
								
								update theming for SwiftUI  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								d6e17f7f56 
								
							
								 
							
						 
						
							
							
								
								minor refactor  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								ffe10c2a54 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into message-detail-screen  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								5464d9c97a 
								
							
								 
							
						 
						
							
							
								
								fix import  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								a127f4c4e2 
								
							
								 
							
						 
						
							
							
								
								WIP: SwiftUI + theming  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								34fbad4570 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into message-detail-screen  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								d30b69911e 
								
							
								 
							
						 
						
							
							
								
								WIP: theming with swiftui  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								RyanZhao
							
						 
						
							 
							
							
								
								
							
							
								
							
								19beff509b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #864  from f-person/feat/all-orientations-for-ipad  
							
							 
							
							... 
							
							
							
							feat: Enable upside down orientation for iPad 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								7d18ed58fc 
								
							
								 
							
						 
						
							
							
								
								minor fix  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								e07887c4aa 
								
							
								 
							
						 
						
							
							
								
								add action sheet  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								114868ef16 
								
							
								 
							
						 
						
							
							
								
								add detailed error info  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								cd0e699bde 
								
							
								 
							
						 
						
							
							
								
								minor refactor  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								ae2a17a527 
								
							
								 
							
						 
						
							
							
								
								add message failing status  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								1805b16fc4 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into message-detail-screen  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								2851e167ff 
								
							
								 
							
						 
						
							
							
								
								WIP: add message failing status  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
								
								
							
							
								
							
								a3b3d2a485 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #873  from oxen-io/dev  
							
							 
							
							... 
							
							
							
							Release 2.3.2 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
								
								
							
							
								
							
								8a47adfe79 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #868  from mpretty-cyro/fix/user-config-crashes  
							
							 
							
							... 
							
							
							
							Fixes for user config crashes 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								6ad303d450 
								
							
								 
							
						 
						
							
							
								
								Updated build and version numbers  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								a3adb23bad 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into fix/user-config-crashes  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	Session/Media Viewing & Editing/PhotoCapture.swift 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								c0270d53e0 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into message-detail-screen  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
								
								
							
							
								
							
								7aa3c9ff66 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #870  from oxen-io/dev  
							
							 
							
							... 
							
							
							
							Release 2.3.1 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
								
								
							
							
								
							
								8ac44b132d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #869  from mpretty-cyro/fix/cherry-pick-certain-fixes  
							
							 
							
							... 
							
							
							
							Include specific fixes from the other branch 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								b12497e305 
								
							
								 
							
						 
						
							
							
								
								Include specific fixes from the other branch  
							
							 
							
							... 
							
							
							
							Fixed a crash with the QRCode scanner
Fixed a crash when trying to take a video attachment 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								f373a989a8 
								
							
								 
							
						 
						
							
							
								
								Fixes for user config crashes  
							
							 
							
							... 
							
							
							
							Added a method to determine if the database is suspended
Updated the code to show the "Failed" state if sending a message fails due to a suspended database
Prevented a crash which could occur in rare cases when accessing the Seed via the home screen prompt (direct user to share logs with session - db locked or device in an invalid state)
Prevented a crash which could occur when trying to send a message due to failing to retrieve the mnemonic (db locked or device in an invalid state)
Fixed a bug where optimistic messages could end up appearing multiple times
Fixed a crash with the QRCode scanner
Fixed a crash when trying to take a video attachment
Fixed a crash where the image picker grid could go out of bounds when selecting elements
Fixed a crash which could occur when a user provides a recovery password with a word that contains less than 3 characters
Fixed a potential issue where the dependency injection could result in a stale date being used in some places (removing the DI here, proper fix requires larger changes in another branch) 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								c2f57700a5 
								
							
								 
							
						 
						
							
							
								
								infinite loop carousel  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								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 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								b4d414bbfe 
								
							
								 
							
						 
						
							
							
								
								add carousel view to message details screen  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								6568ab0d19 
								
							
								 
							
						 
						
							
							
								
								carousel view with swiftui  
							
							 
							
							
							
						 
						
							2 years ago