Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								f370b050a3 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into dev  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								3ab7192b26 
								
							
								 
							
						 
						
							
							
								
								clean up some code related to unread message (requests) count  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								daf0705d42 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into preformance-improvement  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								167d68870a 
								
							
								 
							
						 
						
							
							
								
								show conversation settings button after approving message requests  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								RyanZhao
							
						 
						
							 
							
							
								
								
							
							
								
							
								0332250498 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #568  from mpretty-cyro/fix/failable-message-request-response  
							
							 
							
							... 
							
							
							
							Fix for failing message request responses 
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								bdaae2b347 
								
							
								 
							
						 
						
							
							
								
								Moved the copy for the message request approval error into Localizable.strings  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								f7bfeb6e6d 
								
							
								 
							
						 
						
							
							
								
								fix typo  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								f632763eee 
								
							
								 
							
						 
						
							
							
								
								revert debug code  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								1b3f6c0ca6 
								
							
								 
							
						 
						
							
							
								
								Minor tweaks to the message request banner on the HomeVC  
							
							 
							
							... 
							
							
							
							Fixed the unread message counting for message requests
Updated the message request banner to indicate the number of message requests with an unread message
Updated the message request banner to automatically disappear if the user has no unread message requests
Renamed a variable for ReadReceipt management to make it a bit more self-documenting (it looked like it would trigger a read receipt to be sent regardless of the setting) 
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								1609812e5b 
								
							
								 
							
						 
						
							
							
								
								remove useless expiration flag in data message  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								da66b1af2c 
								
							
								 
							
						 
						
							
							
								
								fix swiping back for approved message request conversation  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								e014fe0367 
								
							
								 
							
						 
						
							
							
								
								prevent the message bubble not being wide enough to show the corner radius for very short message  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								9251d98bde 
								
							
								 
							
						 
						
							
							
								
								Added a loading state when approving a message request  
							
							 
							
							... 
							
							
							
							Removed the 'presentTimer' logic from the 'ModalActivityIndicatorViewController' (the delay looked buggy, if it does have "blipping" issues then we can fix those separately) 
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								f0f4128db2 
								
							
								 
							
						 
						
							
							
								
								Fixed an issue where the MessageRequestResponse could fail to send but would be flagged locally as approved  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								b648d27ba1 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into dev  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								279892e83b 
								
							
								 
							
						 
						
							
							
								
								fix some scrolling to bottom and button issue  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								04d25577f4 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into ipad-support-1  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								6b231316ee 
								
							
								 
							
						 
						
							
							
								
								fix & improve voice message preview in home screen  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								821bd4cadb 
								
							
								 
							
						 
						
							
							
								
								fix visible message bubble round corner issue  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								02cc97a238 
								
							
								 
							
						 
						
							
							
								
								Change Session title in dark mode to white  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								78e2c4f55c 
								
							
								 
							
						 
						
							
							
								
								minor refactor in search bar & message request vc  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								ccae9141ff 
								
							
								 
							
						 
						
							
							
								
								rollback to fix an odd scrolling issue  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								7e92391740 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' of  https://github.com/oxen-io/session-ios  into preformance-improvement  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								RyanZhao
							
						 
						
							 
							
							
								
								
							
							
								
							
								ae7abf6fc1 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #567  from mpretty-cyro/feature/message-request-tweaks  
							
							 
							
							... 
							
							
							
							Message request fixes and tweaks 
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								110c7bb01a 
								
							
								 
							
						 
						
							
							
								
								Addressed PR comments  
							
							 
							
							... 
							
							
							
							Moved the 'backBarButtonItem' into the BaseVC (and removed it for being duplicated in various view controllers)
Removed a redundant line of code 
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								b077061714 
								
							
								 
							
						 
						
							
							
								
								Updated the code to parse an open group URL to handle a '/r/' before the room name  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								e6b941ea8a 
								
							
								 
							
						 
						
							
							
								
								Fixed a number of tweaks and bugs with message requests  
							
							 
							
							... 
							
							
							
							Removed the "Back" text from the back buttons
Removed the inset on the 'Path' settings button so the text remains horizontally centered
Hid the settings button from message request threads
Fixed an issue where the back button would remain visible in a conversation when the search field was visible
Fixed an issue where the tintColor of the conversation search field didn't match the global search field
Fixed an issue where sending an attachment response to a message request wouldn't approve the message request
Updated the size and positioning of the message request 'Clear All' button to match the DM 'Next' button
Updated the message request 'Clear All' button to start visible (so it's visible during the push animation) since that's the most likely state it'll be in
Updated the 'Message Requests' cell to use the pinned background colour
Updated the fallback for contact thread names to be a middle-truncated string (4 characters either side) 
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								27e7c25197 
								
							
								 
							
						 
						
							
							
								
								fix scroll to bottom crash  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								629d952944 
								
							
								 
							
						 
						
							
							
								
								clean  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								885ab66550 
								
							
								 
							
						 
						
							
							
								
								minor improvements on scroll to bottom  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								ec40922cb4 
								
							
								 
							
						 
						
							
							
								
								reduce initial loading on conversation screen  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								2ae0ae40d4 
								
							
								 
							
						 
						
							
							
								
								minor improvements to reduce the database read on UI thread  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								f8c0700ba0 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into dev  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								936fbd27c2 
								
							
								 
							
						 
						
							
							
								
								fix message request notification  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								f22672ccd7 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' of  https://github.com/oxen-io/session-ios  into preformance-improvement  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								c0615fe11d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' of  https://github.com/oxen-io/session-ios  into ipad-support-1  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								RyanZhao
							
						 
						
							 
							
							
								
								
							
							
								
							
								6573610ee9 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #559  from mpretty-cyro/feature/message-requests  
							
							 
							
							... 
							
							
							
							Message Requests Phase 1 
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								028ba0c77a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into feature/message-requests  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	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 
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								c7196a96bc 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into dev  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								66567ba9f5 
								
							
								 
							
						 
						
							
							
								
								clean  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								c85e3ef86b 
								
							
								 
							
						 
						
							
							
								
								clean up unused code  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								7a677a1800 
								
							
								 
							
						 
						
							
							
								
								move pollers to one working queue to avoid race condition  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								819d5a39e1 
								
							
								 
							
						 
						
							
							
								
								Disabled the disappearing message settings for the recipient of a message request as well  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								b32a8cbab2 
								
							
								 
							
						 
						
							
							
								
								fix alert vc for iPad  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								a8c7f517eb 
								
							
								 
							
						 
						
							
							
								
								clean  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								24d8122d78 
								
							
								 
							
						 
						
							
							
								
								fix sharing UI for iPad  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								348331d9ab 
								
							
								 
							
						 
						
							
							
								
								fix present view controller UI issue for iPad  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								9ff369fbd0 
								
							
								 
							
						 
						
							
							
								
								fix settings screen presentation on iPad  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								efab374e7f 
								
							
								 
							
						 
						
							
							
								
								refactor on session search bar decoration  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								ab0714af00 
								
							
								 
							
						 
						
							
							
								
								fix search bar cancel button for iPad  
							
							 
							
							
							
						 
						
							4 years ago