1a15ec9c15 
								
							
								 
							
						 
						
							
							
								
								Merge commit signal/master into signal-1.20  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								6bd2d3962e 
								
							
								 
							
						 
						
							
							
								
								Linted files  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								0de54e125c 
								
							
								 
							
						 
						
							
							
								
								Improve caption editor usability, new 'add attachment' affordance  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								cba47668cd 
								
							
								 
							
						 
						
							
							
								
								Increase contrast of typing indicator in iOS theme  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								aab2a57b48 
								
							
								 
							
						 
						
							
							
								
								Some style and interaction fine-tuning  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a900792a06 
								
							
								 
							
						 
						
							
							
								
								Use thumbnails for smaller cells in image grids  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ba711d8985 
								
							
								 
							
						 
						
							
							
								
								Show just first image if we receive mixed multi-attachment msg  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								52d3138958 
								
							
								 
							
						 
						
							
							
								
								Caption editor: add keyboard interaction, disable for single img  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								6eb8f5680c 
								
							
								 
							
						 
						
							
							
								
								Preserve links with embedded emoji  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								985b1d6aa6 
								
							
								 
							
						 
						
							
							
								
								New staged attachments UI, multiple image attachments per message  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f3367465d8 
								
							
								 
							
						 
						
							
							
								
								Fix menu items not triggering after conversation is removed and then added.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								27674513ba 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'development' into signal-v1.19  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a2f12ca18e 
								
							
								 
							
						 
						
							
							
								
								Added option to copy conversation public key.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								654b0dac84 
								
							
								 
							
						 
						
							
							
								
								Merge signal-master.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								7e612700f7 
								
							
								 
							
						 
						
							
							
								
								Handle session reset, Loki style  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								341c5e4ed8 
								
							
								 
							
						 
						
							
							
								
								Updated nickname display modal.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								51e8bc40b6 
								
							
								 
							
						 
						
							
							
								
								Show public key tooltip when you hover over profile text.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								449f44cc5a 
								
							
								 
							
						 
						
							
							
								
								Added changing user nicknames.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f1d18219ed 
								
							
								 
							
						 
						
							
							
								
								Conversation UI update.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								79a861a870 
								
							
								 
							
						 
						
							
							
								
								Typing Indicators  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								99252702e1 
								
							
								 
							
						 
						
							
							
								
								Support receiving multiple images in one messages  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								dbdd52b4eb 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #50  from Mikunj/fix/friend-request  
							
							... 
							
							
							
							Friend request fixes 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								484efd34a3 
								
							
								 
							
						 
						
							
							
								
								Added friend request message expiration.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a82999818a 
								
							
								 
							
						 
						
							
							
								
								Added blocking/unblocking from friend request.  
							
							... 
							
							
							
							Fixed incoming messages being deleted. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ae2e2fa2ae 
								
							
								 
							
						 
						
							
							
								
								Updated UI in conversation to support user blocking behaviour.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								557fed11f3 
								
							
								 
							
						 
						
							
							
								
								Only display retry send button if the request is pending.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								4d08a74d53 
								
							
								 
							
						 
						
							
							
								
								Updated FriendRequest to be more consistent with the other typescript components.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f45e0030c4 
								
							
								 
							
						 
						
							
							
								
								Added status display and retry send to friend request.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								fc3cb9c46d 
								
							
								 
							
						 
						
							
							
								
								Replace old pending messages with new one when adding a new incoming friend request.  
							
							... 
							
							
							
							More refactoring. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a80d6bb868 
								
							
								 
							
						 
						
							
							
								
								Merged branch correctly.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								0a23888875 
								
							
								 
							
						 
						
							
							
								
								Fix up friend request message layout  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								0cf616328e 
								
							
								 
							
						 
						
							
							
								
								Fixed saving prekey bundle once friend request is accepted.  
							
							... 
							
							
							
							Added option to delete conversation after it is declined. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								9dc19044b9 
								
							
								 
							
						 
						
							
							
								
								Handle the case where the user is sending a friend request.  
							
							... 
							
							
							
							Fix up styling for outgoing message. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								08ca779fe1 
								
							
								 
							
						 
						
							
							
								
								Fixed up friend request message display  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								5626cfe47d 
								
							
								 
							
						 
						
							
							
								
								Added FriendRequest message  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f589fdac5c 
								
							
								 
							
						 
						
							
							
								
								Merge signal changes into branch.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								4b9fcb98d4 
								
							
								 
							
						 
						
							
							
								
								Linting and other housekeeping stuff  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a7d78c0e9b 
								
							
								 
							
						 
						
							
							
								
								Sealed Sender support  
							
							... 
							
							
							
							https://signal.org/blog/sealed-sender/  
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								7789beec64 
								
							
								 
							
						 
						
							
							
								
								Calculate warning properly for all methods of attachment download  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								9370e2b74a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/signalapp/Signal-Desktop  into development  
							
							... 
							
							
							
							* 'master' of https://github.com/signalapp/Signal-Desktop : (38 commits)
  v1.17.0
  v1.17.0-beta.4
  Ensure that blue group avatars are preserved in dark theme
  Android theme: Incoming quotes take color from containing message
  Conversations have blue avatar backgrounds if no image provided
  Fix lint errors
  Add ca language
  inboxView: Ensure Conversation exists for our own number
  Ensure that file is not attached if we've filtered it
  v1.17.0-beta.3
  Localization updates
  v1.16.3
  Lint fixes
  Lint fixes
  Better handle large numbers of messages in cache on startup
  Keep object stores after conversations migrate to SQLCipher
  Longer timeout for orphaned file cleanup
  Tests and increase consistency for isFileDangerous calls
  Longer timeout for orphaned file cleanup
  v1.17.0-beta.2
  ...
# Conflicts:
#	background.html
#	package.json 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								fbaef50c4a 
								
							
								 
							
						 
						
							
							
								
								Android theme: Incoming quotes take color from containing message  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								bc0ec92ad2 
								
							
								 
							
						 
						
							
							
								
								Tests and increase consistency for isFileDangerous calls  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								0850dc368a 
								
							
								 
							
						 
						
							
							
								
								Lint fixes  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								7d9711ba65 
								
							
								 
							
						 
						
							
							
								
								Restore iOS-specific theme; colors on left in android theme  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ca61c9cb85 
								
							
								 
							
						 
						
							
							
								
								Warnings for dangerous files  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								8f3e3b7aaf 
								
							
								 
							
						 
						
							
							
								
								Update to new design for avatars: individual/group icons/colors  
							
							... 
							
							
							
							And two initials. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								10c53bddb0 
								
							
								 
							
						 
						
							
							
								
								Move to new colors, switch incoming/outgoing colors  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								22a86b5351 
								
							
								 
							
						 
						
							
							
								
								store key bundle status in conversation model  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								9c399624cc 
								
							
								 
							
						 
						
							
							
								
								Support for blocking groups on mobile, via group/blocked syncs  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								8290146721 
								
							
								 
							
						 
						
							
							
								
								Show generic attachment for non-loading/too-large images/videos  
							
							
							
						 
						
							7 years ago