534343f8b0 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling  
							
							... 
							
							
							
							# Conflicts:
#	Session/Closed Groups/NewClosedGroupVC.swift
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/ConversationVC.swift
#	Session/Conversations/ConversationViewModel.swift
#	Session/Conversations/Settings/ThreadSettingsViewModel.swift
#	Session/Home/GlobalSearch/GlobalSearchViewController.swift
#	Session/Home/HomeVC.swift
#	Session/Home/New Conversation/NewDMVC.swift
#	Session/Media Viewing & Editing/GIFs/GifPickerViewController.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/Settings/BlockedContactsViewController.swift
#	Session/Settings/NukeDataModal.swift
#	Session/Settings/SettingsViewModel.swift
#	SessionMessagingKit/Shared Models/SessionThreadViewModel.swift
#	SessionUIKit/Components/ConfirmationModal.swift 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								5b5f4a4e88 
								
							
								 
							
						 
						
							
							
								
								Various tweaks and fixes  
							
							... 
							
							
							
							Fixed an issue where the GlobalSearch push animation could be jittery
Fixed a crash which could occur when returning from the background on certain screens
Removed the keyboard dismiss animation when pushing from global search to a conversation (apparently this is how iMessage avoids the animation bug...)
Updated to the latest version of GRDB
Updated the Atomic wrapper to use the ReadWrite lock for less blocking behaviours
Updated the audio attachment icon to be consistent with Android & Desktop
Updated the QuoteView to omit the "author" if we don't have their name and the quote can't be found 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								8c8453d922 
								
							
								 
							
						 
						
							
							
								
								Updated to the latest libSession, fixed remaining items  
							
							... 
							
							
							
							Updated to the latest libSession version
Updated the 'hidden' logic to be based on a negative 'priority' value
Added an index on the Quote table to speed up conversation query
Fixed an odd behaviour with GRDB and Combine (simplified the interface as well)
Fixed an issue where migrations could fail 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								16d4d0128e 
								
							
								 
							
						 
						
							
							
								
								add a new format for video duration  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								2ff85ebda1 
								
							
								 
							
						 
						
							
							
								
								fix UI issues  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								3f33caf91a 
								
							
								 
							
						 
						
							
							
								
								wip: carousel view  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								fbc2eb35ec 
								
							
								 
							
						 
						
							
							
								
								wip: carousel media preview view  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								d4957de746 
								
							
								 
							
						 
						
							
							
								
								update media info view  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								68efe731e7 
								
							
								 
							
						 
						
							
							
								
								WIP: Media info vc  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								94456edd2e 
								
							
								 
							
						 
						
							
							
								
								wrap up media info container view  
							
							
							
						 
						
							3 years ago