54d0f06139 
								
							
								 
							
						 
						
							
							
								
								add some general localised strings  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								8109a326cf 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into feature/theming  
							
							... 
							
							
							
							# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Closed Groups/NewClosedGroupVC.swift
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/Message Cells/CallMessageCell.swift
#	Session/Conversations/Views & Modals/JoinOpenGroupModal.swift
#	Session/Home/HomeVC.swift
#	Session/Home/New Conversation/NewDMVC.swift
#	Session/Home/NewConversationButtonSet.swift
#	Session/Meta/Translations/de.lproj/Localizable.strings
#	Session/Meta/Translations/en.lproj/Localizable.strings
#	Session/Meta/Translations/es.lproj/Localizable.strings
#	Session/Meta/Translations/fa.lproj/Localizable.strings
#	Session/Meta/Translations/fi.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/id-ID.lproj/Localizable.strings
#	Session/Meta/Translations/it.lproj/Localizable.strings
#	Session/Meta/Translations/ja.lproj/Localizable.strings
#	Session/Meta/Translations/nl.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/si.lproj/Localizable.strings
#	Session/Meta/Translations/sk.lproj/Localizable.strings
#	Session/Meta/Translations/sv.lproj/Localizable.strings
#	Session/Meta/Translations/th.lproj/Localizable.strings
#	Session/Meta/Translations/vi-VN.lproj/Localizable.strings
#	Session/Meta/Translations/zh-Hant.lproj/Localizable.strings
#	Session/Meta/Translations/zh_CN.lproj/Localizable.strings
#	Session/Open Groups/JoinOpenGroupVC.swift
#	Session/Open Groups/OpenGroupSuggestionGrid.swift
#	Session/Settings/SettingsVC.swift
#	Session/Shared/BaseVC.swift
#	Session/Shared/OWSQRCodeScanningViewController.m
#	Session/Shared/ScanQRCodeWrapperVC.swift
#	Session/Shared/UserCell.swift
#	SessionMessagingKit/Configuration.swift
#	SessionShareExtension/SAEScreenLockViewController.swift
#	SessionUIKit/Style Guide/Gradients.swift
#	SignalUtilitiesKit/Media Viewing & Editing/OWSViewController+ImageEditor.swift
#	SignalUtilitiesKit/Screen Lock/ScreenLockViewController.m 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								6e3c80c16b 
								
							
								 
							
						 
						
							
							
								
								feat: search contacts in create closed group page  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								67a9047df7 
								
							
								 
							
						 
						
							
							
								
								update grey background color  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								e5c3c23e74 
								
							
								 
							
						 
						
							
							
								
								WIP: new closed group vc  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								face9da02b 
								
							
								 
							
						 
						
							
							
								
								Fixed search performance, started styling in-conversaiton settings  
							
							... 
							
							
							
							Fixed a bug where the scroll to bottom button wasn't working
Fixed an issue where searching was running on the main thread (which could cause UI issues)
Updated the searching to interrupt the previous query when the search term changes
Updated the in-conversation settings to be use the new config-based approach (deleted the OWSConversationSettingsViewController) 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								3c07a2d044 
								
							
								 
							
						 
						
							
							
								
								Added linting for the localized strings, updated the quote & mention behaviour for the current user  
							
							... 
							
							
							
							Added a script and build step to error if we have localised a string in code bug don't have an entry in the localisable files
Added the logic and UI to replace the current users public key (or blinded key) with 'You' in mentions and quotes
Cleaned up some duplicate & missing localised strings
Fixed a bug where new closed groups weren't getting setup locally correctly
Updated the id truncating behaviour to always truncate from the middle 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								cdb211b72a 
								
							
								 
							
						 
						
							
							
								
								Applied the "increase min version to iOS 13" changes  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								efab374e7f 
								
							
								 
							
						 
						
							
							
								
								refactor on session search bar decoration  
							
							
							
						 
						
							4 years ago  
				
					
						
							
							
								 
						
							
							
								68ec1654e8 
								
							
								 
							
						 
						
							
							
								
								rebuild global search UI  
							
							
							
						 
						
							4 years ago  
				
					
						
							
							
								 
						
							
							
								fed1218538 
								
							
								 
							
						 
						
							
							
								
								WIP: global search UI  
							
							
							
						 
						
							4 years ago  
				
					
						
							
							
								 
						
							
							
								8bdbac3eb3 
								
							
								 
							
						 
						
							
							
								
								Create SessionUIKit  
							
							
							
						 
						
							5 years ago