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  
				
					
						
							
							
								 
						
							
							
								c3b909ae6e 
								
							
								 
							
						 
						
							
							
								
								fix an UI issue of navigation bar  
							
							
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								432238debe 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #970  from RyanRory/disappearing-messages-v2-post-enabling  
							
							... 
							
							
							
							Cleaning up legacy disappearing messages 
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								bef27ee0c7 
								
							
								 
							
						 
						
							
							
								
								Fixed build issues resulting from rebase after Onboarding  
							
							
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								ce01f128f3 
								
							
								 
							
						 
						
							
							
								
								Replaced Cocoapods with Swift Package Manager for dependency management  
							
							
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								07389bf592 
								
							
								 
							
						 
						
							
							
								
								clean up stage 1  
							
							
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								003816117f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into standardised-strings  
							
							
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								6758ad010e 
								
							
								 
							
						 
						
							
							
								
								show message input box when permission is changed in a conversation  
							
							
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								592d743c82 
								
							
								 
							
						 
						
							
							
								
								Fixed a bug where the conversation settings button message request bug  
							
							
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								527c921df3 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'onboarding' into standardised-strings  
							
							
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								1726930e2e 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into onboarding  
							
							
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								a91024f0bb 
								
							
								 
							
						 
						
							
							
								
								Separate streams for attachment upload/download and bug fixes  
							
							... 
							
							
							
							• Updated the code to stop sending legacy PNs outside of legacy group conversations
• Updated the logger logic to clean things up and use the local date/time (with time zone info) to ease debugging user reports
• Fixed an issue where messages in a community could incorrectly accept disappearing message settings
• Fixed an issue where duplicate messages could be sent in some cases
• Fixed an issue where the conversation might not scroll to the bottom after sending an attachment
• Fixed an issue where attachment encryption was happening in a db write thread 
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								b58a3f23cd 
								
							
								 
							
						 
						
							
							
								
								Fixed a couple of bugs in the ConversationVC  
							
							... 
							
							
							
							• Fixed a bug where a disappearing voice message wouldn't stop playing
• Fixed a bug where the conversation screen was never freed from memory
• Fixed an issue with an earlier change where the openGroupManager cache would access itself while modifying itself causing a crash 
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								d9a64e0148 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into standardised-strings  
							
							... 
							
							
							
							# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Closed Groups/EditClosedGroupVC.swift
#	Session/Closed Groups/NewClosedGroupVC.swift
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/ConversationVC.swift
#	Session/Conversations/Emoji Picker/EmojiPickerCollectionView.swift
#	Session/Conversations/Settings/ThreadSettingsViewModel.swift
#	Session/Emoji/Emoji+Available.swift
#	Session/Home/New Conversation/NewDMVC.swift
#	Session/Media Viewing & Editing/GIFs/GifPickerViewController.swift
#	Session/Meta/AppDelegate.swift
#	Session/Meta/SessionApp.swift
#	Session/Onboarding/PNModeVC.swift
#	Session/Path/PathVC.swift
#	Session/Utilities/IP2Country.swift
#	SessionMessagingKit/Messages/Control Messages/SharedConfigMessage.swift
#	SessionMessagingKit/Sending & Receiving/Pollers/OpenGroupPoller.swift
#	SessionMessagingKit/Sending & Receiving/Pollers/Poller.swift
#	SessionNotificationServiceExtension/NotificationError.swift
#	SessionUIKit/Style Guide/Values.swift
#	SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentCaptionToolbar.swift 
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								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 
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								fee7f09c38 
								
							
								 
							
						 
						
							
							
								
								Fixed keyboard obscuring the calls UI in one case, fixed QA ids  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								8fe3cf7562 
								
							
								 
							
						 
						
							
							
								
								update strings and minor fix  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								96832484b3 
								
							
								 
							
						 
						
							
							
								
								minor refactor on getting app name  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								f4a979f55f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'onboarding' into standardised-strings  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								534c0a13df 
								
							
								 
							
						 
						
							
							
								
								rename dynamic variables in strings  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								6d297dc2a9 
								
							
								 
							
						 
						
							
							
								
								update strings  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								8d99f64f56 
								
							
								 
							
						 
						
							
							
								
								Fixed a few more bugs  
							
							... 
							
							
							
							• Fixed an issue where the message status wouldn't update to the failed state if the MessageSendJob timed-out
• Fixed an issue where network issues could result in a backlog of TypingIndicator messages that failed to send (don't bother retrying them)
• Fixed an issue where concurrent jobs might not retry correctly if other jobs don't complete or the retry was triggered from the wrong queue
• Fixed an issue where the input view could disappear in some cases 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								352f6d7337 
								
							
								 
							
						 
						
							
							
								
								Fixed a number of bugs found while testing the internal build  
							
							... 
							
							
							
							• Reworked the keyboard avoidance in ConversationVC to fix some bugs and simplify the behaviour
• Moved the message request footer UI into it's own view
• Fixed an issue where paths wouldn't get built for a new isntall
• Fixed an issue where a couple of LibSession+Networking errors weren't getting logged correctly
• Fixed a log that could be thrown incorrect for a unique constraint failure
• Fixed an annoying startup warning due to thread priorities 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								87efc38a04 
								
							
								 
							
						 
						
							
							
								
								minor refactor on context menu actions  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								62af0aa907 
								
							
								 
							
						 
						
							
							
								
								update more localized strings  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								1904a795b8 
								
							
								 
							
						 
						
							
							
								
								WIP: add new strings  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								71e3925820 
								
							
								 
							
						 
						
							
							
								
								replace "Show Less" and disappearing messages outdated client banner  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								f7098e27d6 
								
							
								 
							
						 
						
							
							
								
								fix conflicts of merging dev  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								756e256d9a 
								
							
								 
							
						 
						
							
							
								
								Moving libSession into SessionUtilitiesKit to expose it to other targets  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								fd1c368ca0 
								
							
								 
							
						 
						
							
							
								
								WIP: check for any untouched strings  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								4054796da1 
								
							
								 
							
						 
						
							
							
								
								apply new localized string format  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								3c7ac96b5a 
								
							
								 
							
						 
						
							
							
								
								replace NSLocalizedString() wiith .localized, and remove CommonStrings  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								d9a73bea95 
								
							
								 
							
						 
						
							
							
								
								adding missing strings  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								0ebf0ea365 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into standardised-strings  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								72fa1ae52a 
								
							
								 
							
						 
						
							
							
								
								WIP: add accessibility ids  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								673170360d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into onboarding  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								8f0b6d8202 
								
							
								 
							
						 
						
							
							
								
								WIP: Replace strings  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								f9ef58c9d3 
								
							
								 
							
						 
						
							
							
								
								WIP: add strings  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								d25783c4df 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into onboarding  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								cac29a573a 
								
							
								 
							
						 
						
							
							
								
								Optimised jumping between messages to avoid excessive loading  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								001936e1b6 
								
							
								 
							
						 
						
							
							
								
								Updated the in-conversation search to prioritise currently visible results  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								0038a78df3 
								
							
								 
							
						 
						
							
							
								
								fix outdated client banner  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								c561a05273 
								
							
								 
							
						 
						
							
							
								
								WIP: fix outdated client banner  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								9af95a672e 
								
							
								 
							
						 
						
							
							
								
								only show outdated client banner when disappearing message is enabled  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								d492290303 
								
							
								 
							
						 
						
							
							
								
								WIP: fix outdated client banner with sql query  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								666061fec9 
								
							
								 
							
						 
						
							
							
								
								fix outdated client banner in conversation screen  
							
							
							
						 
						
							2 years ago