Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								e5a46a993d 
								
							
								 
							
						 
						
							
							
								
								update emoji names for searching  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								ed3dcf7634 
								
							
								 
							
						 
						
							
							
								
								add comments and minor refactor back to previous logic  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								e6e97684b4 
								
							
								 
							
						 
						
							
							
								
								fix 6 reactors case in user list  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								b47e5accd6 
								
							
								 
							
						 
						
							
							
								
								Updated some more message types and modals  
							
							 
							
							... 
							
							
							
							Added a disabled state to the OutlineButton
Finished of the last bits for the BlockedContacts screen
Applied theming to the LinkPreview
Applied theming to the Call info message (and it's prompt)
Fixed a minor issue where showing the ContextMenu (via long press) could look odd due to the input field being dismissed
Swapped the LinkPreviewModal to use the standard ConfirmationModal
Removed a redundant closure from the ConfirmationModal 
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								d5948c0142 
								
							
								 
							
						 
						
							
							
								
								fix a crash when remove reaction and there are exactly 6 reactors  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								98cf10cfea 
								
							
								 
							
						 
						
							
							
								
								fix crash on clicking on more reactors cell  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								3e8abd1952 
								
							
								 
							
						 
						
							
							
								
								tweak: make seqNo optional  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								c2ffdc091c 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into emoji-react-tweak-1  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
								
								
							
							
								
							
								aa9019e0b3 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #684  from mpretty-cyro/fix/home-typing-indicator  
							
							 
							
							... 
							
							
							
							Fixed a bug where the typing indicator wasn't working on the home screen 
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								1afdfa8bcb 
								
							
								 
							
						 
						
							
							
								
								Fixed a bug where the typing indicator wasn't working on the home screen  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								6a8b14b8d2 
								
							
								 
							
						 
						
							
							
								
								tweak: refactor reaction deletion  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								82e55a8d5b 
								
							
								 
							
						 
						
							
							
								
								tweak: local reaction entry logic change  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								eef56d47de 
								
							
								 
							
						 
						
							
							
								
								update build number  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								ddbbf63d14 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into emoji-react-tweak-1  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								faecb82062 
								
							
								 
							
						 
						
							
							
								
								tweak: update the logic of adding local reaction entry after message sent or open group api api call success  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
								
								
							
							
								
							
								3aa231360d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #681  from mpretty-cyro/fix/multithreading-crash  
							
							 
							
							... 
							
							
							
							Added fixes and defensive coding for a number of crashes 
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								fc860e3957 
								
							
								 
							
						 
						
							
							
								
								Added fixes and defensive coding for a number of crashes  
							
							 
							
							... 
							
							
							
							Fixed a crash which could occur due to multithreaded dependency access
Fixed a crash which could occur if the 'keyWindow' wasn't set on the LandingVC in time since we were force-unwrapping
Fixed a crash which could occur due to multithreaded swarm cache access
Fixed the broken unit tests 
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								931a356537 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into emoji-react-tweak-1  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
								
								
							
							
								
							
								7c7193f198 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #679  from mpretty-cyro/fix/migration-crash  
							
							 
							
							... 
							
							
							
							Fixed an issue which could cause the DB migration to fail for users with closed groups 
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								31dcb3c985 
								
							
								 
							
						 
						
							
							
								
								feat: cache remove all for open group emoji reacts  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								4a3fe4cdeb 
								
							
								 
							
						 
						
							
							
								
								tweak: view height of reaction user list  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								c4aeecdf4b 
								
							
								 
							
						 
						
							
							
								
								tweak:  fully rounded corners for all message bubbles  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								e9d598e62a 
								
							
								 
							
						 
						
							
							
								
								feat: add text at the bottom saying of the reactors list indicating the number of other reactors  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								08a52f9497 
								
							
								 
							
						 
						
							
							
								
								Fixed an issue which could cause the DB migration to fail for users with closed groups  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								7efc0a61c7 
								
							
								 
							
						 
						
							
							
								
								update translation  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								5a29df56fc 
								
							
								 
							
						 
						
							
							
								
								update translation  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								6b20fbf610 
								
							
								 
							
						 
						
							
							
								
								add translation  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								7f5b7ef703 
								
							
								 
							
						 
						
							
							
								
								Updated the conversation creation screens  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								681fe92ee5 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into menu-redesign  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								a9b084f322 
								
							
								 
							
						 
						
							
							
								
								update build number  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								RyanZhao
							
						 
						
							 
							
							
								
								
							
							
								
							
								d5a1c310f1 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #676  from RyanRory/emoji-reacts-tweaks  
							
							 
							
							... 
							
							
							
							Emoji reacts open group poll & update conflict handling 
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								395e585ea0 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into emoji-reacts-tweaks  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								29dd85ebe7 
								
							
								 
							
						 
						
							
							
								
								minor refactor  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								c82ee0c44b 
								
							
								 
							
						 
						
							
							
								
								Finished off the updated settings sections and fixed a couple of bugs  
							
							 
							
							... 
							
							
							
							Added the Blocked contacts screen
Added a setting to control whether concurrent audio messages should auto-play
Finished updating the settings screens
Fixed an issue where items that should be removed from the PagedDatabaseObserver due to filter logic weren't getting removed in some cases 
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
								
								
							
							
								
							
								d2b2aa9f50 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #677  from mpretty-cyro/fix/moved-previous-fix-from-wrong-location  
							
							 
							
							... 
							
							
							
							Moved the code for a previous fix to the correct location and fixed a build issue 
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								8f1a03db88 
								
							
								 
							
						 
						
							
							
								
								Moved the code for a previous fix to the correct location and fixed a build issue  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								a1e88329db 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into feature/theming  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	Podfile.lock
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/Message Cells/VisibleMessageCell.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/Notifications/AppNotifications.swift
#	SessionMessagingKit/Shared Models/MessageViewModel.swift
#	SessionMessagingKit/Shared Models/SessionThreadViewModel.swift
#	SignalUtilitiesKit/Profile Pictures/ProfilePictureView.swift 
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								ae639b2474 
								
							
								 
							
						 
						
							
							
								
								minor fix  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								287fabb390 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into emoji-reacts-tweaks  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								81ef5a744a 
								
							
								 
							
						 
						
							
							
								
								fix count logic  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								543f729247 
								
							
								 
							
						 
						
							
							
								
								feat: add local cache and deal with merging for reaction changes  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
								
								
							
							
								
							
								a0e43875e7 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #674  from mpretty-cyro/fix/data-extraction-timestamp  
							
							 
							
							... 
							
							
							
							Fixed a bug where the "DataExtractionNotification" messages weren't correctly setting their tmestamps 
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
								
								
							
							
								
							
								64189b0bf0 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #673  from mpretty-cyro/fix/various-bugs  
							
							 
							
							... 
							
							
							
							Fixed a few bugs 
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
								
								
							
							
								
							
								39bd03e6fa 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #670  from mpretty-cyro/fix/use-default-notification-audio  
							
							 
							
							... 
							
							
							
							Fixed a bug where the "default" notification sound wouldn't be used in the foreground 
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								84ccb63b35 
								
							
								 
							
						 
						
							
							
								
								Fixed a bug where the "DataExtractionNotification" messages weren't correctly setting their tmestamps  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								f0c27db52f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into fix/use-default-notification-audio  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								c73bb43c56 
								
							
								 
							
						 
						
							
							
								
								Fixed a few bugs  
							
							 
							
							... 
							
							
							
							Fixed a bug where open group message deletion wasn't thread-specific
Fixed a bug where the user couldn't delete pending/failed messages being sent to an open group
Fixed a bug where deleting content from "related" tables wouldn't correctly trigger an update within the PagedDatabaseObserver
Fixed a bug where a user that was an admin/mod of one open group would incorrectly appear to be an admin/mod of all open groups 
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								3a81ffc752 
								
							
								 
							
						 
						
							
							
								
								feat: add response for reaction endpoints  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								128ef747b3 
								
							
								 
							
						 
						
							
							
								
								tweak: only fetch and show 5 reactors for open group reactions  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								f9c2a2ce99 
								
							
								 
							
						 
						
							
							
								
								tweak: fix an issue where we may delete the wrong open group message and update reactions to wrong open group messages in other threads with the same server id  
							
							 
							
							
							
						 
						
							3 years ago