Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								f7fd15dae0 
								
							
								 
							
						 
						
							
							
								
								Finished removing usages to non-theme colour variables  
							
							 
							
							... 
							
							
							
							Updated theming throughout
Fixed a couple of bugs with the media gallery 
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
								
								
							
							
								
							
								d01e756c67 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #693  from mpretty-cyro/fix/regression-issues  
							
							 
							
							... 
							
							
							
							Fixed a few bugs found during regression testing 
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								a59d1b8153 
								
							
								 
							
						 
						
							
							
								
								Fixed a few bugs found during regression testing  
							
							 
							
							... 
							
							
							
							Increased version & build numbers for release
Fixed a bug where the closed group info messages might not include names for members added/removed when the profile was unknown
Fixed a bug where removing members from closed groups wasn't showing an info message correctly
Fixed a minor layout issue in the CallMessageCell 
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								7dc75af361 
								
							
								 
							
						 
						
							
							
								
								Fixed some bugs with disappearing messages  
							
							 
							
							... 
							
							
							
							Fixed an issue where the DisappearingMessages job could incorrectly overwrite it's nextRunTimestamp
Fixed an issue where sent/self-send messages wouldn't correctly trigger the disappearing messages job
Fixed an issue where sending the mnemonic along with an attachment wasn't showing the warning prompt
Fixed an issue where the home screen wasn't updating on launch if the displayed messages were removed disappearing messages
Fixed a small UI glitch where the input field wouldn't immediately get cleared when sending a message (unfortunately there is a slight delay before the message appears still) 
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								RyanZhao
							
						 
						
							 
							
							
								
								
							
							
								
							
								81d4497ed1 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #691  from RyanRory/open-group-permissions  
							
							 
							
							... 
							
							
							
							Disable typing and message requests in open groups if no "write" permission 
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								RyanZhao
							
						 
						
							 
							
							
								
								
							
							
								
							
								a52673f130 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #692  from RyanRory/call-waiting-time-increment  
							
							 
							
							... 
							
							
							
							Increase call connecting time from 30s to 60s 
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								d14cd07a5c 
								
							
								 
							
						 
						
							
							
								
								minor refactor  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								10ecd32e4b 
								
							
								 
							
						 
						
							
							
								
								increase call connecting time from 30s to 60s  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								07fb498664 
								
							
								 
							
						 
						
							
							
								
								minor fix  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								05bb1e1e61 
								
							
								 
							
						 
						
							
							
								
								clean up Permissions  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								0539e4b192 
								
							
								 
							
						 
						
							
							
								
								clean up  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								30e0e40ffa 
								
							
								 
							
						 
						
							
							
								
								feat: disable typing and message requests in open groups if you don’t have "write" permission  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								1bc6b0bdba 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into feature/theming  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/ConversationVC.swift
#	Session/Conversations/ConversationViewModel.swift
#	Session/Conversations/Message Cells/VisibleMessageCell.swift
#	Session/Home/HomeVC.swift
#	Session/Home/Message Requests/MessageRequestsViewController.swift
#	Session/Media Viewing & Editing/MediaTileViewController.swift
#	Session/Meta/AppDelegate.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/Onboarding/LandingVC.swift
#	SessionMessagingKitTests/_TestUtilities/MockGeneralCache.swift 
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								851cc56c65 
								
							
								 
							
						 
						
							
							
								
								Fixed a couple of bugs with the emoji picker and context menu  
							
							 
							
							... 
							
							
							
							Cleaned up the context menu appearance and the message timestamp appearing off screen issue
Fixed an issue with keyboard avoidance on the emoji picker 
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								RyanZhao
							
						 
						
							 
							
							
								
								
							
							
								
							
								570883e28a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #687  from RyanRory/badcall-fix  
							
							 
							
							... 
							
							
							
							Voice & video call fix 
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								RyanZhao
							
						 
						
							 
							
							
								
								
							
							
								
							
								31b62e28a7 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #685  from RyanRory/emoji-react-tweak-2  
							
							 
							
							... 
							
							
							
							Emoji reacts tweaks 
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								RyanZhao
							
						 
						
							 
							
							
								
								
							
							
								
							
								cfecc71163 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #665  from RyanRory/add-silence-audio  
							
							 
							
							... 
							
							
							
							Fix notification sound None not working 
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								5bfa9eede3 
								
							
								 
							
						 
						
							
							
								
								ux: hide search bar cancel button when tapping on entering group name text field  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								e0550a6afb 
								
							
								 
							
						 
						
							
							
								
								tweak: max group name length decrease to 30  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								afd908a64a 
								
							
								 
							
						 
						
							
							
								
								ui: add gradient background for create new group button  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								b8c7199429 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into menu-redesign  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								7715c5ea09 
								
							
								 
							
						 
						
							
							
								
								Did some more styling and fixed a few UI bugs  
							
							 
							
							... 
							
							
							
							Fixed a bug where the time label would no longer appear in the context menu
Fixed a bug where the tile label in the context menu could be clipped
Tweaked the context menu appearance animation to look less jumpy when at the edges of the screen 
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								ac008fbd35 
								
							
								 
							
						 
						
							
							
								
								WIP: Gradient background for closed group create button  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
								
								
							
							
								
							
								ab95841f6c 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #690  from mpretty-cyro/fix/filter-unblinded-mentions  
							
							 
							
							... 
							
							
							
							Updated open groups to filter the mentions list based on blinding 
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								11071c3dbc 
								
							
								 
							
						 
						
							
							
								
								fix contacts search in new closed group page  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								65d615ef24 
								
							
								 
							
						 
						
							
							
								
								fix join community button title  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								df669030ac 
								
							
								 
							
						 
						
							
							
								
								fix community suggestion grid issues.  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								88ad6483c1 
								
							
								 
							
						 
						
							
							
								
								Updated open groups to filter the mentions list based on blinding  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								eeea448673 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into quote-standardise  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								b4d29c58c4 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into menu-redesign  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								RyanZhao
							
						 
						
							 
							
							
								
								
							
							
								
							
								70e326f819 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #656  from RyanRory/message-request-tweak  
							
							 
							
							... 
							
							
							
							Message request Block & Decline behaviour changes 
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								RyanZhao
							
						 
						
							 
							
							
								
								
							
							
								
							
								b0eaeedc7d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #647  from RyanRory/ui-media-message  
							
							 
							
							... 
							
							
							
							Media message UI redesign 
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								RyanZhao
							
						 
						
							 
							
							
								
								
							
							
								
							
								d0e32a8272 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #646  from RyanRory/add-documents-section  
							
							 
							
							... 
							
							
							
							Add documents section for all media page 
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								fe14bb1b31 
								
							
								 
							
						 
						
							
							
								
								Fixed a couple of bugs and did some more theming  
							
							 
							
							... 
							
							
							
							Started trying to add the unit tests that were in the settings refactor branch (need to be refactored due to the implementation changes)
Fixed a bug where the typing indicators wouldn't get cleaned up in some cases 
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								157e8f10e5 
								
							
								 
							
						 
						
							
							
								
								Fixed some threading issues with the OWSQRCodeScanningViewController  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								77b084bc34 
								
							
								 
							
						 
						
							
							
								
								clean up - remove unused strings  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								47463280d2 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into quote-standardise  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								c121f99b22 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into add-silence-audio  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								d939f95b4f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into message-request-tweak  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								4ca2adcd13 
								
							
								 
							
						 
						
							
							
								
								tweaks on scan QR code for community  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								5dc8f4e6e2 
								
							
								 
							
						 
						
							
							
								
								clean up  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								e2e77f3e50 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into ui-media-message  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								747695c39b 
								
							
								 
							
						 
						
							
							
								
								minor fix on threading issue  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								2e67bc9374 
								
							
								 
							
						 
						
							
							
								
								feat: automatically open the community conversation if tapping on suggestion grids to join  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								d840204bc2 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into add-documents-section  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								93c2f0f503 
								
							
								 
							
						 
						
							
							
								
								Fixed some bugs with disappearing messages  
							
							 
							
							... 
							
							
							
							Fixed an issue where the DisappearingMessages job could incorrectly overwrite it's nextRunTimestamp
Fixed an issue where sent/self-send messages wouldn't correctly trigger the disappearing messages job
Fixed an issue where sending the mnemonic along with an attachment wasn't showing the warning prompt
Fixed an issue where the home screen wasn't updating on launch if the displayed messages were removed disappearing messages
Fixed a small UI glitch where the input field wouldn't immediately get cleared when sending a message (unfortunately there is a slight delay before the message appears still) 
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								82aa2d0931 
								
							
								 
							
						 
						
							
							
								
								minor refactor  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								e7778725a5 
								
							
								 
							
						 
						
							
							
								
								feat: add close button on new conversation screens  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								ec8b9df3bb 
								
							
								 
							
						 
						
							
							
								
								minor tableview tweaks  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								6e3c80c16b 
								
							
								 
							
						 
						
							
							
								
								feat: search contacts in create closed group page  
							
							 
							
							
							
						 
						
							3 years ago