c25f378c54 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'feature/database-refactor' into emoji-reacts  
							
							... 
							
							
							
							# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/Context Menu/ContextMenuVC+Action.swift
#	Session/Conversations/Context Menu/ContextMenuVC+ActionView.swift
#	Session/Conversations/Context Menu/ContextMenuVC.swift
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/ConversationVC.swift
#	Session/Conversations/ConversationViewItem.h
#	Session/Conversations/ConversationViewItem.m
#	Session/Conversations/Message Cells/Content Views/LinkPreviewView.swift
#	Session/Conversations/Message Cells/MessageCell.swift
#	Session/Conversations/Message Cells/VisibleMessageCell.swift
#	Session/Conversations/Views & Modals/BodyTextView.swift
#	Session/Meta/Translations/en.lproj/Localizable.strings
#	Session/Shared/UserCell.swift
#	SessionMessagingKit/Jobs/MessageSendJob.swift
#	SessionMessagingKit/Messages/Signal/TSMessage.h
#	SessionMessagingKit/Messages/Signal/TSMessage.m
#	SessionMessagingKit/Messages/Visible Messages/VisibleMessage.swift
#	SessionMessagingKit/Open Groups/OpenGroupAPIV2.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift
#	SessionMessagingKit/Sending & Receiving/Notifications/NotificationsProtocol.h
#	SessionMessagingKit/Sending & Receiving/Pollers/OpenGroupPollerV2.swift
#	SessionMessagingKit/Utilities/General.swift
#	SessionNotificationServiceExtension/NSENotificationPresenter.swift
#	SignalUtilitiesKit/Utilities/DisplayableText.swift
#	SignalUtilitiesKit/Utilities/NoopNotificationsManager.swift
#	SignalUtilitiesKit/Utilities/Notification+Loki.swift 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								8cf2a57fcc 
								
							
								 
							
						 
						
							
							
								
								Renamed GRDBStorage to Storage (no use having the prefix anymore since the old DB is deprecated)  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								eeccfb47d5 
								
							
								 
							
						 
						
							
							
								
								Fixed all of the build errors from merge, migrated Call logic, started idBlinding migration and bug fixes  
							
							... 
							
							
							
							Fixed some broken file paths
Fixed a couple of bugs with closed groups
Fixed a few migration issues
Fixed a bug with the ProfilePictureView in open groups (was including the open parenthesis in the initials)
Migrated the Id Blinding changes to work with GRDB
Migrated the call logic to work with GRDB
Updated the code to work the with hard fork changes 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								6cb3e1db22 
								
							
								 
							
						 
						
							
							
								
								add interaction for showing missed call tips if the permission is denied  
							
							
							
						 
						
							4 years ago  
				
					
						
							
							
								 
						
							
							
								4b38f8b3b6 
								
							
								 
							
						 
						
							
							
								
								improve call message showing contact name  
							
							
							
						 
						
							4 years ago  
				
					
						
							
							
								 
						
							
							
								6703d8c7f4 
								
							
								 
							
						 
						
							
							
								
								add timestamp to call message UI  
							
							
							
						 
						
							4 years ago  
				
					
						
							
							
								 
						
							
							
								9e6c81d28b 
								
							
								 
							
						 
						
							
							
								
								improve call message UI  
							
							
							
						 
						
							4 years ago  
				
					
						
							
							
								 
						
							
							
								0a3d84d5c8 
								
							
								 
							
						 
						
							
							
								
								WIP: Call message Ui improvements  
							
							
							
						 
						
							4 years ago