Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								2032dafc74 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into feature/swift-package-manager  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ExpirationTimers.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver.swift
#	SessionSnodeKit/Networking/SnodeAPI.swift
#	SessionUtilitiesKit/Media/DataSource.h
#	SessionUtilitiesKit/Media/DataSource.m 
							
						 
						
							1 year ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
								
								
							
							
								
							
								432238debe 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #970  from RyanRory/disappearing-messages-v2-post-enabling  
							
							 
							
							... 
							
							
							
							Cleaning up legacy disappearing messages 
							
						 
						
							1 year ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								fd8fdb1105 
								
							
								 
							
						 
						
							
							
								
								Updated the PrimaryFillButton text colours  
							
							 
							
							
							
						 
						
							1 year ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								0673194079 
								
							
								 
							
						 
						
							
							
								
								Minor theme change  
							
							 
							
							
							
						 
						
							1 year ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								ce01f128f3 
								
							
								 
							
						 
						
							
							
								
								Replaced Cocoapods with Swift Package Manager for dependency management  
							
							 
							
							
							
						 
						
							1 year ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								da6c407e9f 
								
							
								 
							
						 
						
							
							
								
								Minor tweaks  
							
							 
							
							
							
						 
						
							1 year ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								ed472f44c5 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into release/2.6.3  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	Session/Meta/AppDelegate.swift
#	Session/Onboarding/LandingVC.swift
#	Session/Onboarding/LinkDeviceVC.swift
#	Session/Onboarding/RegisterVC.swift
#	Session/Onboarding/RestoreVC.swift 
							
						 
						
							1 year ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								1fd65230b7 
								
							
								 
							
						 
						
							
							
								
								Fixed the broken unit tests  
							
							 
							
							... 
							
							
							
							• Added a method to customise mock parameter summaries for unit tests
• Pulled across the updated libSession cache logic 
							
						 
						
							1 year ago  
						
					 
				
					
						
							
							
								 
								Ryan ZHAO
							
						 
						
							 
							
							
							
								
							
								aebb68656b 
								
							
								 
							
						 
						
							
							
								
								fix an issue where on small screen the error message under text input box won't be fully displayed  
							
							 
							
							
							
						 
						
							1 year ago  
						
					 
				
					
						
							
							
								 
								Ryan ZHAO
							
						 
						
							 
							
							
							
								
							
								16f47d4f87 
								
							
								 
							
						 
						
							
							
								
								fix an issue where copy is cut off on small devices  
							
							 
							
							
							
						 
						
							1 year ago  
						
					 
				
					
						
							
							
								 
								Ryan ZHAO
							
						 
						
							 
							
							
							
								
							
								de4a367374 
								
							
								 
							
						 
						
							
							
								
								fix an issue that the navigation bar won't change as the appearance settings changes  
							
							 
							
							
							
						 
						
							1 year ago  
						
					 
				
					
						
							
							
								 
								Ryan ZHAO
							
						 
						
							 
							
							
							
								
							
								c342deb94e 
								
							
								 
							
						 
						
							
							
								
								fix input colour after error occured  
							
							 
							
							
							
						 
						
							1 year ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								e420ce4e58 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into onboarding  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/ConversationVC.swift
#	Session/Home/New Conversation/NewDMVC.swift
#	Session/Onboarding/PNModeVC.swift
#	SessionUIKit/Style Guide/Values.swift 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								9491b4a97b 
								
							
								 
							
						 
						
							
							
								
								Fixed a crash and config issue  
							
							 
							
							... 
							
							
							
							• Fixed a bad memory crash which could occur when returning from the background
• Fixed an issue where config messages were incorrectly getting double wrapped in protobuf wrappers 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								c6c2881338 
								
							
								 
							
						 
						
							
							
								
								Reworked the libSession network to be instance based  
							
							 
							
							... 
							
							
							
							• Fixed an issue where the DisappearingMessagesJob was getting run for every individual message process instead of just once after processing all messages from a poll
• Tweaked the polling logic to split the user, groups and community pollers into separate queues
• Tweaked the logic to restart the open group poller immediately after joining a community (to avoid an edge-case where there could be a long delay before the initial poll is made)
• Tweaked the logic for checking if PNs are susceptible to failure to only dispatch to the main thread once
• Cleaned up some warnings
• Updated the app versioning to be at the project level instead of target level
• Added the ability to define a unique hash for a job for deduplication 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								c065abc584 
								
							
								 
							
						 
						
							
							
								
								Cleaned up a bunch of warnings, renamed a couple of folders  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan ZHAO
							
						 
						
							 
							
							
							
								
							
								54d0f06139 
								
							
								 
							
						 
						
							
							
								
								add some general localised strings  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan ZHAO
							
						 
						
							 
							
							
							
								
							
								86576e4193 
								
							
								 
							
						 
						
							
							
								
								fix a crash on iPad when tapping share in invite a friend screen  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan ZHAO
							
						 
						
							 
							
							
							
								
							
								de0a3b0ee0 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into onboarding  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan ZHAO
							
						 
						
							 
							
							
							
								
							
								e235b6059f 
								
							
								 
							
						 
						
							
							
								
								fix an issue where the keyboard can be covering voice call buttons  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan ZHAO
							
						 
						
							 
							
							
							
								
							
								d1fa40c52e 
								
							
								 
							
						 
						
							
							
								
								fix the document message in message info screen  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan ZHAO
							
						 
						
							 
							
							
							
								
							
								98ab03c454 
								
							
								 
							
						 
						
							
							
								
								add accessibility ids  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan ZHAO
							
						 
						
							 
							
							
							
								
							
								72fa1ae52a 
								
							
								 
							
						 
						
							
							
								
								WIP: add accessibility ids  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan ZHAO
							
						 
						
							 
							
							
							
								
							
								f5afdae646 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into message-detail-screen  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan ZHAO
							
						 
						
							 
							
							
							
								
							
								673170360d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into onboarding  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan ZHAO
							
						 
						
							 
							
							
							
								
							
								d63f3a8bee 
								
							
								 
							
						 
						
							
							
								
								fix disappearing message settings subtitle copy  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan ZHAO
							
						 
						
							 
							
							
							
								
							
								a4286212b4 
								
							
								 
							
						 
						
							
							
								
								imp: default contact list of global search screen  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan ZHAO
							
						 
						
							 
							
							
							
								
							
								b443e72092 
								
							
								 
							
						 
						
							
							
								
								minor fix after merging latest dev  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan ZHAO
							
						 
						
							 
							
							
							
								
							
								d25783c4df 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into onboarding  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan ZHAO
							
						 
						
							 
							
							
							
								
							
								adf71f0c3b 
								
							
								 
							
						 
						
							
							
								
								WIP: updated sorting for global search  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan ZHAO
							
						 
						
							 
							
							
							
								
							
								2f740c7065 
								
							
								 
							
						 
						
							
							
								
								WIP: refactor global search screen into SwiftUI  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								661720a988 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Meta/Translations/ar.lproj/Localizable.strings
#	Session/Meta/Translations/be.lproj/Localizable.strings
#	Session/Meta/Translations/bg.lproj/Localizable.strings
#	Session/Meta/Translations/bn.lproj/Localizable.strings
#	Session/Meta/Translations/cs.lproj/Localizable.strings
#	Session/Meta/Translations/da.lproj/Localizable.strings
#	Session/Meta/Translations/de.lproj/Localizable.strings
#	Session/Meta/Translations/el.lproj/Localizable.strings
#	Session/Meta/Translations/en.lproj/Localizable.strings
#	Session/Meta/Translations/eo.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/hu.lproj/Localizable.strings
#	Session/Meta/Translations/id.lproj/Localizable.strings
#	Session/Meta/Translations/it.lproj/Localizable.strings
#	Session/Meta/Translations/ja.lproj/Localizable.strings
#	Session/Meta/Translations/ko.lproj/Localizable.strings
#	Session/Meta/Translations/ku.lproj/Localizable.strings
#	Session/Meta/Translations/lt.lproj/Localizable.strings
#	Session/Meta/Translations/lv.lproj/Localizable.strings
#	Session/Meta/Translations/ne-NP.lproj/Localizable.strings
#	Session/Meta/Translations/nl.lproj/Localizable.strings
#	Session/Meta/Translations/no.lproj/Localizable.strings
#	Session/Meta/Translations/pl.lproj/Localizable.strings
#	Session/Meta/Translations/pt-BR.lproj/Localizable.strings
#	Session/Meta/Translations/pt-PT.lproj/Localizable.strings
#	Session/Meta/Translations/ro.lproj/Localizable.strings
#	Session/Meta/Translations/ru.lproj/Localizable.strings
#	Session/Meta/Translations/si-LK.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/tr.lproj/Localizable.strings
#	Session/Meta/Translations/uk.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/Configuration.swift
#	SessionUtilitiesKit/Database/Storage.swift 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan ZHAO
							
						 
						
							 
							
							
							
								
							
								ecd8083ebe 
								
							
								 
							
						 
						
							
							
								
								WIP: refactor global search screen into SwiftUI  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan ZHAO
							
						 
						
							 
							
							
							
								
							
								3ea127ab5e 
								
							
								 
							
						 
						
							
							
								
								imp: customised search bar in SwiftUI  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan ZHAO
							
						 
						
							 
							
							
							
								
							
								16b597e35a 
								
							
								 
							
						 
						
							
							
								
								organize file  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan ZHAO
							
						 
						
							 
							
							
							
								
							
								0fc40edb71 
								
							
								 
							
						 
						
							
							
								
								update the text input to support multiple lines  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan ZHAO
							
						 
						
							 
							
							
							
								
							
								c5eb55d1e8 
								
							
								 
							
						 
						
							
							
								
								WIP: implement start new conversation screen with SwiftUI  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan ZHAO
							
						 
						
							 
							
							
							
								
							
								e47d6cdb1b 
								
							
								 
							
						 
						
							
							
								
								fix: standardise default display picture  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								3f19c776d9 
								
							
								 
							
						 
						
							
							
								
								Fixed a few issues around jumping between messages  
							
							 
							
							... 
							
							
							
							Fixed a bug where tapping on quotes could break after loading lots of visible cells
Fixed a bug where a cell which contained both links and a quote would only ever let you interact with the quote
Fixed an issue where message highlight wasn't working when jumping between messages 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan ZHAO
							
						 
						
							 
							
							
							
								
							
								be5418dc4a 
								
							
								 
							
						 
						
							
							
								
								further refactor on background  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan ZHAO
							
						 
						
							 
							
							
							
								
							
								20db5a48a3 
								
							
								 
							
						 
						
							
							
								
								minor refactor on background  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan ZHAO
							
						 
						
							 
							
							
							
								
							
								16fbffd3d5 
								
							
								 
							
						 
						
							
							
								
								fix underline for links  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan ZHAO
							
						 
						
							 
							
							
							
								
							
								6ac0307650 
								
							
								 
							
						 
						
							
							
								
								clean  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan ZHAO
							
						 
						
							 
							
							
							
								
							
								3c5c68f10d 
								
							
								 
							
						 
						
							
							
								
								fix an crash in SwiftUI preview  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								2a10ab208a 
								
							
								 
							
						 
						
							
							
								
								clean up and implementation in message info screen  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								f603b422b0 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into message-detail-screen  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	Session/Media Viewing & Editing/MediaInfoVC+MediaPreviewView.swift
#	SignalUtilitiesKit/Media Viewing & Editing/OWSVideoPlayer.swift 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								cf63d6e48f 
								
							
								 
							
						 
						
							
							
								
								imp: modal of hiding recovery password permanently  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								45d2964bf1 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into onboarding  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								0632514d45 
								
							
								 
							
						 
						
							
							
								
								imp: updated recovery password screen  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								12347c9f2f 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	Session/Media Viewing & Editing/MediaDetailViewController.swift 
							
						 
						
							2 years ago