3dc0ed255c 
								
							
								 
							
						 
						
							
							
								
								fix text got cut off unexpectedly in modals  
							
							
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								a749f8d656 
								
							
								 
							
						 
						
							
							
								
								further fix on scrollable modal  
							
							
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								37f142f1eb 
								
							
								 
							
						 
						
							
							
								
								fix an UI issue for confirmation model  
							
							
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								f8fb647752 
								
							
								 
							
						 
						
							
							
								
								fix some modals  
							
							
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								5881b36384 
								
							
								 
							
						 
						
							
							
								
								implement  Open URL modal  
							
							
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								ce01f128f3 
								
							
								 
							
						 
						
							
							
								
								Replaced Cocoapods with Swift Package Manager for dependency management  
							
							
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								da6c407e9f 
								
							
								 
							
						 
						
							
							
								
								Minor tweaks  
							
							
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								19b4055a2e 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'onboarding' into standardised-strings  
							
							
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								aebb68656b 
								
							
								 
							
						 
						
							
							
								
								fix an issue where on small screen the error message under text input box won't be fully displayed  
							
							
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								ecb1b83a8e 
								
							
								 
							
						 
						
							
							
								
								upgrade to minimum iOS 15.0 support  
							
							
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								90de873ea0 
								
							
								 
							
						 
						
							
							
								
								add and modify strings  
							
							
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								1d01eb91ae 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'onboarding' into standardised-strings  
							
							
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								c342deb94e 
								
							
								 
							
						 
						
							
							
								
								fix input colour after error occured  
							
							
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								f4a979f55f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'onboarding' into standardised-strings  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								63658f70d7 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into standardised-strings  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								54d0f06139 
								
							
								 
							
						 
						
							
							
								
								add some general localised strings  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								86576e4193 
								
							
								 
							
						 
						
							
							
								
								fix a crash on iPad when tapping share in invite a friend screen  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								de0a3b0ee0 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into onboarding  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								e235b6059f 
								
							
								 
							
						 
						
							
							
								
								fix an issue where the keyboard can be covering voice call buttons  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								6a04ba5fc2 
								
							
								 
							
						 
						
							
							
								
								fix untouched strings  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								0ebf0ea365 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into standardised-strings  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								72fa1ae52a 
								
							
								 
							
						 
						
							
							
								
								WIP: add accessibility ids  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								f5afdae646 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into message-detail-screen  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								a4286212b4 
								
							
								 
							
						 
						
							
							
								
								imp: default contact list of global search screen  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								d25783c4df 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into onboarding  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								2f740c7065 
								
							
								 
							
						 
						
							
							
								
								WIP: refactor global search screen into SwiftUI  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								ecd8083ebe 
								
							
								 
							
						 
						
							
							
								
								WIP: refactor global search screen into SwiftUI  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								3ea127ab5e 
								
							
								 
							
						 
						
							
							
								
								imp: customised search bar in SwiftUI  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								16b597e35a 
								
							
								 
							
						 
						
							
							
								
								organize file  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								0fc40edb71 
								
							
								 
							
						 
						
							
							
								
								update the text input to support multiple lines  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								16fbffd3d5 
								
							
								 
							
						 
						
							
							
								
								fix underline for links  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								2a10ab208a 
								
							
								 
							
						 
						
							
							
								
								clean up and implementation in message info screen  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								cf63d6e48f 
								
							
								 
							
						 
						
							
							
								
								imp: modal of hiding recovery password permanently  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								45d2964bf1 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into onboarding  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								f9531a4cc8 
								
							
								 
							
						 
						
							
							
								
								polish the recovery password remider  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								a6931bb922 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign  
							
							... 
							
							
							
							# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
#	Session/Conversations/Settings/ThreadSettingsViewModel.swift
#	Session/Shared/SessionTableViewController.swift
#	Session/Shared/SessionTableViewModel.swift
#	Session/Shared/Types/SessionTableSection.swift
#	SessionTests/Conversations/Settings/ThreadDisappearingMessagesViewModelSpec.swift
#	SessionUIKit/Components/SessionButton.swift 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								89b38dc2f5 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #928  from mpretty-cyro/fix/blocked-contacts-crash  
							
							... 
							
							
							
							Fixed a crash on the blocked contacts screen and refactoring 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								f97170fdcd 
								
							
								 
							
						 
						
							
							
								
								Fixed a crash on the blocked contacts screen and refactoring  
							
							... 
							
							
							
							Refactored the SessionThreadViewModel to reduce boilerplate and clean up the interface a little
Refactored the MessageRequestsViewController to use the SessionTableViewController
Fixed a crash when returning from the background on the BlockedContactsViewModel
Fixed some minor lag on the NotificationSoundViewModel
Added an optional initial loading message to the SessionTableViewController 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								3a9ada581d 
								
							
								 
							
						 
						
							
							
								
								Fixed an issue where theme changes stopped updating nav styling  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								6e9cbe402f 
								
							
								 
							
						 
						
							
							
								
								add accessibility id for radio buttons  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								23f67763f4 
								
							
								 
							
						 
						
							
							
								
								WIP: toast  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								353abe7089 
								
							
								 
							
						 
						
							
							
								
								imp: toast view  
							
							
							
						 
						
							2 years ago