6dc5d3031b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into message-detail-screen  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								f5afdae646 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into message-detail-screen  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								e1bb6de7d6 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into feature/drop-yap-database-support  
							
							... 
							
							
							
							# Conflicts:
#	Podfile.lock
#	SessionMessagingKit/Database/Migrations/_003_YDBToGRDBMigration.swift 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								bd0a25bbe9 
								
							
								 
							
						 
						
							
							
								
								fix an issue that a disappearing messages control message will be removed by a race condition  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								6d2e07dea6 
								
							
								 
							
						 
						
							
							
								
								fix an issue for local generated expiration update messages being removed immediately.  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								fdae955288 
								
							
								 
							
						 
						
							
							
								
								fix data extraction message DaR  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								b2360d8e1a 
								
							
								 
							
						 
						
							
							
								
								fix an issue where DaR messages are read on linked devices won't have correct expiration start time  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								9a528f8c71 
								
							
								 
							
						 
						
							
							
								
								fix disappearing message control message already read on linked devices  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								84492be016 
								
							
								 
							
						 
						
							
							
								
								Fixed build issues, removed invalid unit tests and missing copy  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								43e2983f49 
								
							
								 
							
						 
						
							
							
								
								fix call messages and data extraction messages with their expiration info and refactor  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								1c6232e4d7 
								
							
								 
							
						 
						
							
							
								
								minor refactor  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								a563cddba8 
								
							
								 
							
						 
						
							
							
								
								Added a timeout for the MessageSendJob and additional logging  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								e1d6a9dfc1 
								
							
								 
							
						 
						
							
							
								
								Added a migration to recreate any invalid FTS tables  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								cbcdb9b37f 
								
							
								 
							
						 
						
							
							
								
								Refactored AppContext and AppRediness to Swift  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								084586e6ba 
								
							
								 
							
						 
						
							
							
								
								change call messages and data extraction notification to be DaR if needed  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								04d734ef87 
								
							
								 
							
						 
						
							
							
								
								use local disappearing messages setting for call messages and data extraction notifications  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								ac30b3c797 
								
							
								 
							
						 
						
							
							
								
								fix unsend requests  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								ff691529c4 
								
							
								 
							
						 
						
							
							
								
								Do NOT expire control messages in groups  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								e38fb400ea 
								
							
								 
							
						 
						
							
							
								
								refactor on the way that attaching disappearing messages config to messages  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								9fc5f8fa68 
								
							
								 
							
						 
						
							
							
								
								WIP: refactoring the way of applying disappearing messages settings  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								c9df2a73e7 
								
							
								 
							
						 
						
							
							
								
								bring back false deleted logic  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								b22fe40d6e 
								
							
								 
							
						 
						
							
							
								
								fix an issue where received expiration update control message should already be read  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								7693e53183 
								
							
								 
							
						 
						
							
							
								
								minor refactor and fix expiration update message for control messages  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								74efe8cc72 
								
							
								 
							
						 
						
							
							
								
								fix an issue for legacy groups disappearing message update control message  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								490cde57ce 
								
							
								 
							
						 
						
							
							
								
								fix disappearing messages update control messages for legacy groups  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								362dcd3528 
								
							
								 
							
						 
						
							
							
								
								remove last change timestamp in local database  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								5d2a307d5e 
								
							
								 
							
						 
						
							
							
								
								WIP: update copies and implement following setting  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								15e8c9bd09 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'RyanFork/disappearing-message-redesign' into feature/drop-yap-database-support  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								39c9ec7357 
								
							
								 
							
						 
						
							
							
								
								clean  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								60684bc977 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'RyanFork/disappearing-message-redesign' into feature/drop-yap-database-support  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								70326b5c74 
								
							
								 
							
						 
						
							
							
								
								fix disappearing messages for closed group control messages  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								3d1b930ede 
								
							
								 
							
						 
						
							
							
								
								feat: update disappearing messages ui for visible messages  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								2d6db6a768 
								
							
								 
							
						 
						
							
							
								
								feat(disabled): remove message requests from community when leaving this community  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								928d7f2b1e 
								
							
								 
							
						 
						
							
							
								
								add comments and minor refactor  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								a64d054537 
								
							
								 
							
						 
						
							
							
								
								only start disappearing messages after a message successfully sent  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								71fa811064 
								
							
								 
							
						 
						
							
							
								
								WIP: handle disappearing message failed to send  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								12347c9f2f 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign  
							
							... 
							
							
							
							# Conflicts:
#	Session/Media Viewing & Editing/MediaDetailViewController.swift 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								de7d85f4cb 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into fix/media-interactions  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								819106b0f2 
								
							
								 
							
						 
						
							
							
								
								Fixed a bug where profiles with blank name values wouldn't fallback correctly  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								18b296bcd8 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'disappearing-message-redesign' into feature/drop-yap-database-support  
							
							... 
							
							
							
							# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Meta/AppDelegate.swift
#	Session/Meta/Translations/de.lproj/Localizable.strings
#	Session/Meta/Translations/es-ES.lproj/Localizable.strings
#	Session/Meta/Translations/fi.lproj/Localizable.strings
#	Session/Meta/Translations/fr.lproj/Localizable.strings
#	Session/Meta/Translations/it.lproj/Localizable.strings
#	Session/Meta/Translations/ja.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/sk.lproj/Localizable.strings
#	Session/Meta/Translations/zh-CN.lproj/Localizable.strings
#	Session/Meta/Translations/zh-TW.lproj/Localizable.strings
#	SessionMessagingKit/Database/LegacyDatabase/SMKLegacy.swift
#	SessionMessagingKit/Database/Migrations/_003_YDBToGRDBMigration.swift
#	SessionMessagingKit/Messages/Control Messages/ConfigurationMessage.swift
#	SessionSnodeKit/Database/LegacyDatabase/SSKLegacy.swift
#	SessionSnodeKit/Database/Migrations/_003_YDBToGRDBMigration.swift
#	SessionUtilitiesKit/Database/LegacyDatabase/SUKLegacy.swift
#	SessionUtilitiesKit/Database/Migrations/_003_YDBToGRDBMigration.swift 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								90cd3fb5e0 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign  
							
							... 
							
							
							
							# Conflicts:
#	_SharedTestUtilities/MockJobRunner.swift 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								42b49e0227 
								
							
								 
							
						 
						
							
							
								
								Added unit tests to verify migrations between all versions work  
							
							... 
							
							
							
							Fixed a busted test import 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								c787d2558f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into message-detail-screen  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								bf58831313 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign  
							
							... 
							
							
							
							# Conflicts:
#	Scripts/LintLocalizableStrings.swift 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								33ef2b0920 
								
							
								 
							
						 
						
							
							
								
								refactor and fix issues that some control messages were not following disappearing messages settings  
							
							
							
						 
						
							2 years ago