Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								c74d9a89f5 
								
							
								 
							
						 
						
							
							
								
								Fixed broken tests  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								12347c9f2f 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	Session/Media Viewing & Editing/MediaDetailViewController.swift 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
								
								
							
							
								
							
								109a81f33f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #929  from mpretty-cyro/fix/media-interactions  
							
							 
							
							... 
							
							
							
							Fixed a few bugs and crashes around media interactions 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								f809a71c8b 
								
							
								 
							
						 
						
							
							
								
								Updated the config merge process to only consider timestamps from merged messages  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								05460ca2b3 
								
							
								 
							
						 
						
							
							
								
								Fixed a bug where the play button wouldn't appear when swiping attachments  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								de7d85f4cb 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into fix/media-interactions  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
								
								
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
								
								
							
							
								
							
								638685a8cc 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #925  from mpretty-cyro/fix/blank-display-name-handling  
							
							 
							
							... 
							
							
							
							Fixed a bug where profiles with blank name values wouldn't fallback correctly 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
								
								
							
							
								
							
								e427e59544 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #926  from mpretty-cyro/fix/rare-multi-threading-crash  
							
							 
							
							... 
							
							
							
							Fixed a crash which could occur when scrolling conversation messages 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
								
								
							
							
								
							
								aec2aed81f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #927  from mpretty-cyro/fix/snode-info-deduping  
							
							 
							
							... 
							
							
							
							Fixed an issue where the messages might not get reprocessed when they should 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
								
								
							
							
								
							
								4b9e15e5c1 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #924  from mpretty-cyro/fix/theme-nav-issue  
							
							 
							
							... 
							
							
							
							Fixed an issue where theme changes stopped updating nav styling 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								bd98db2612 
								
							
								 
							
						 
						
							
							
								
								Fixed a few bugs and crashes around media interactions  
							
							 
							
							... 
							
							
							
							Fixed a crash when trying to grant permission to access additional photos
Fixed a bug where audio files would incorrectly get recognised as voice messages
Replaced our custom video/audio players with the native ones (which have additional built-in controls)
Updated the errors from SSKKeychainStorage to include useful information
Updated layout for audio attachments 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								b3eb78aaee 
								
							
								 
							
						 
						
							
							
								
								Fixed the broken tests  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								b97c0955be 
								
							
								 
							
						 
						
							
							
								
								Copy tweak to better support localization  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								d1d2531ced 
								
							
								 
							
						 
						
							
							
								
								Fixed a minor layout issue and string linter tweaks  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								085a1a59aa 
								
							
								 
							
						 
						
							
							
								
								Fixed an issue where the messages might not get reprocessed when they should  
							
							 
							
							... 
							
							
							
							Dropped the auto-incrementing id from the SnodeReceivedMessageInfo
Changed the 'key, hash' from a uniqueKey to a primaryKey to allow "upsert" behaviours to work 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								658240e549 
								
							
								 
							
						 
						
							
							
								
								Fixed a crash which could occur when scrolling conversation messages  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								819106b0f2 
								
							
								 
							
						 
						
							
							
								
								Fixed a bug where profiles with blank name values wouldn't fallback correctly  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								3a9ada581d 
								
							
								 
							
						 
						
							
							
								
								Fixed an issue where theme changes stopped updating nav styling  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								b20e533929 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
								
								
							
							
								
							
								6d57523ede 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #923  from mpretty-cyro/fix/apple-required-copy-change  
							
							 
							
							... 
							
							
							
							Change the 'Grant Camera Access' copy to 'Continue' at Apple's request & Updated translations 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								06f12a58b0 
								
							
								 
							
						 
						
							
							
								
								Change the 'Grant Camera Access' copy to 'Continue' at Apple's request  
							
							 
							
							... 
							
							
							
							Updated translations again 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								c6455ceb3a 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
								
								
							
							
								
							
								187902e48a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #861  from KeeJef/master  
							
							 
							
							... 
							
							
							
							Update Session iOS screenshot 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								992cc233c5 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
								
								
							
							
								
							
								c81616c145 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #922  from mpretty-cyro/fix/string-linter-for-archives  
							
							 
							
							... 
							
							
							
							Fixed an issue where string validation was failing on archive builds 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								8346a2e610 
								
							
								 
							
						 
						
							
							
								
								Fixed an issue where string validation was failing on archive builds  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								90cd3fb5e0 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	_SharedTestUtilities/MockJobRunner.swift 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
								
								
							
							
								
							
								bd64d182f8 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #920  from mpretty-cyro/fix/blocked-contacts-issues  
							
							 
							
							... 
							
							
							
							Fix contacts missing from blocked contact list issue 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								ed33e1f2e2 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into fix/blocked-contacts-issues  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								2cff251e8d 
								
							
								 
							
						 
						
							
							
								
								Fixed a bug with the blocked contacts list  
							
							 
							
							... 
							
							
							
							Fixed a bug where blocked contacts without profile information wouldn't be included in the blocked contacts list
Fixed broken test build issues
Increased build and version numbers 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
								
								
							
							
								
							
								74f32e9ea3 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #919  from mpretty-cyro/fix/add-migration-tests  
							
							 
							
							... 
							
							
							
							Add migration tests 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								9dd2e896bb 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into fix/add-migration-tests  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	SessionMessagingKit/SessionUtil/SessionUtil.swift 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
								
								
							
							
								
							
								4a95b4c921 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #918  from mpretty-cyro/fix/onboarding-bugs  
							
							 
							
							... 
							
							
							
							Fixed a couple of onboarding bugs and tweaks some logs 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								42b49e0227 
								
							
								 
							
						 
						
							
							
								
								Added unit tests to verify migrations between all versions work  
							
							 
							
							... 
							
							
							
							Fixed a busted test import 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								f9dc85b7ab 
								
							
								 
							
						 
						
							
							
								
								Fixed a couple of onboarding bugs and tweaks some logs  
							
							 
							
							... 
							
							
							
							Fixed an issue where starting and then restarting onboarding would get the app into an invalid state
Fixed an issue where newline characters could cause issues with parsing the recovery phrase
Added additional logs to better be able to understand the database state 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								e4357f153e 
								
							
								 
							
						 
						
							
							
								
								Removed an unneeded import breaking the CI tests  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								5b7c9d866c 
								
							
								 
							
						 
						
							
							
								
								Updated the 'MessageReceiverDisappearingMessagesSpec' to the updated pattern  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								bf58831313 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	Scripts/LintLocalizableStrings.swift 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
								
								
							
							
								
							
								0c5f3f2db9 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #914  from mpretty-cyro/feature/rework-localized-string-validation  
							
							 
							
							... 
							
							
							
							Refactored the LintLocalizableStrings 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								655fcb5808 
								
							
								 
							
						 
						
							
							
								
								Minor log tweak  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								5917cf103f 
								
							
								 
							
						 
						
							
							
								
								Refactored the LintLocalizableStrings  
							
							 
							
							... 
							
							
							
							Added inline errors & warnings (regex could use some work to remove invalid cases)
Added a build step to validate the strings are included in the app and it's extensions 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								6e9cbe402f 
								
							
								 
							
						 
						
							
							
								
								add accessibility id for radio buttons  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								8721d8c5f3 
								
							
								 
							
						 
						
							
							
								
								update accessibility ids  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								01671438d5 
								
							
								 
							
						 
						
							
							
								
								fix issues that the expiresStartAtMs not being set correctly  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								33ef2b0920 
								
							
								 
							
						 
						
							
							
								
								refactor and fix issues that some control messages were not following disappearing messages settings  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								946acf3089 
								
							
								 
							
						 
						
							
							
								
								fix an issue where clicking on user count didn't navigate to the correct screen  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								00008787cc 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	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 
							
						 
						
							2 years ago