2bcd8e28ab 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into standardised-strings  
							
							... 
							
							
							
							# Conflicts:
#	Scripts/LintLocalizableStrings.swift
#	Session.xcodeproj/project.pbxproj
#	Session/Closed Groups/EditClosedGroupVC.swift
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/Message Cells/Content Views/QuoteView.swift
#	Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
#	Session/Conversations/Settings/ThreadSettingsViewModel.swift
#	Session/Conversations/Views & Modals/ConversationTitleView.swift
#	Session/Home/GlobalSearch/GlobalSearchViewController.swift
#	Session/Media Viewing & Editing/GIFs/GifPickerViewController.swift
#	Session/Media Viewing & Editing/PhotoCaptureViewController.swift
#	Session/Media Viewing & Editing/PhotoLibrary.swift
#	Session/Notifications/UserNotificationsAdaptee.swift
#	Session/Open Groups/JoinOpenGroupVC.swift
#	Session/Settings/NukeDataModal.swift
#	Session/Shared/ScanQRCodeWrapperVC.swift
#	SessionMessagingKit/Database/Models/Attachment.swift
#	SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift
#	SessionMessagingKit/Database/Models/RecipientState.swift
#	SessionMessagingKit/Sending & Receiving/Attachments/SignalAttachment.swift
#	SessionShareExtension/ShareNavController.swift
#	SessionShareExtension/ThreadPickerVC.swift
#	SessionUIKit/Components/TopBannerController.swift
#	SessionUtilitiesKit/General/String+Utilities.swift
#	SessionUtilitiesKit/Networking/IPv4.swift
#	SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentApprovalInputAccessoryView.swift
#	SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentApprovalViewController.swift
#	SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentCaptionToolbar.swift
#	SignalUtilitiesKit/Screen Lock/ScreenLock.swift 
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								ce01f128f3 
								
							
								 
							
						 
						
							
							
								
								Replaced Cocoapods with Swift Package Manager for dependency management  
							
							
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								63658f70d7 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into standardised-strings  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								f9ef58c9d3 
								
							
								 
							
						 
						
							
							
								
								WIP: add strings  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								0e376d0d8a 
								
							
								 
							
						 
						
							
							
								
								rename Environment to SessionEnvironment to avoid conflicts on SwiftUI @Environment  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								a998cadbb7 
								
							
								 
							
						 
						
							
							
								
								Fixed the broken unit tests  
							
							... 
							
							
							
							Fixed a few bugs uncovered by the unit tests 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								59696f7d2c 
								
							
								 
							
						 
						
							
							
								
								Removed all the old Storage classes and YapDB extensions  
							
							... 
							
							
							
							Removed the AppUpdateNag code (unused)
Removed the Mantle dependency 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								cf66edb723 
								
							
								 
							
						 
						
							
							
								
								Further work on SessionMessagingKit migrations  
							
							... 
							
							
							
							Added migrations for contacts and started working through thread migration (have contact and closed group threads migrating)
Deprecated usage of ECKeyPair in the migrations (want to be able to remove Curve25519Kit in the future) 
							
						 
						
							4 years ago  
				
					
						
							
							
								 
						
							
							
								bbac6cc5ed 
								
							
								 
							
						 
						
							
							
								
								Attempt to fix extensions  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								3c3f1ed7b8 
								
							
								 
							
						 
						
							
							
								
								Disable problematic code  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								ac6baec6f2 
								
							
								 
							
						 
						
							
							
								
								Make things compile again  
							
							
							
						 
						
							5 years ago