a0f67c22da 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'textsecure/master' into merge_1_21_0  
							
							... 
							
							
							
							* textsecure/master: (26 commits)
  v1.21.0
  v1.21.0-beta.4
  Dark Theme: Preserve blue background on app loading screen
  Localization updates
  Fix width of audio player when window is very narrow
  A number of small fixes for Link Previews
  Get rid of the white flash when the app starts up (#3083 )
  v1.21.0-beta.3
  Lint fixes
  Introduce new language: NB
  Fail over to all numbers in retry if errors don't have numbers
  Use the proper method for pulling attachments off disk for retry
  Fix rendering bug with verified state in updateVerified()
  Update electron-builder and electron-updater
  Ensure that dialog pops up when permissions denied for voice note
  Lint fixes
  Large update to localization strings
  Link Previews
  Ensure that blocked messages are dropped even after sealed sender
  Don't linkify quoted message contents
  ...
# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	_locales/cs/messages.json
#	background.html
#	config/default.json
#	index.html
#	js/models/conversations.js
#	js/modules/web_api.js
#	js/settings_start.js
#	js/views/conversation_view.js
#	js/views/settings_view.js
#	package.json
#	protos/SignalService.proto
#	stylesheets/_index.scss
#	stylesheets/_settings.scss 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ddfc99a461 
								
							
								 
							
						 
						
							
							
								
								Added online indicator to conversation header.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								9b382de6da 
								
							
								 
							
						 
						
							
							
								
								Added online indicator.  
							
							... 
							
							
							
							Disable selection in contacts. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								813924685e 
								
							
								 
							
						 
						
							
							
								
								Link Previews  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								51f1ef5725 
								
							
								 
							
						 
						
							
							
								
								Don't linkify quoted message contents  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								14ecbc3f35 
								
							
								 
							
						 
						
							
							
								
								Moved MainHeader into its own Backbone View.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a807b6eacd 
								
							
								 
							
						 
						
							
							
								
								Show expand icon on main header.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								cb3599eea8 
								
							
								 
							
						 
						
							
							
								
								Removed IdentityKeyHeader.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1be63b52b2 
								
							
								 
							
						 
						
							
							
								
								Show contact name on main header.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f5954db711 
								
							
								 
							
						 
						
							
							
								
								Ensure that multi-video lightbox scrolling changes video  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ac4e04912c 
								
							
								 
							
						 
						
							
							
								
								Minor language fixes.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								98c4b5d77b 
								
							
								 
							
						 
						
							
							
								
								Added editing own nickname.  
							
							... 
							
							
							
							Fix dark theme support.
Fix notification titles. 
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								c150cbe34f 
								
							
								 
							
						 
						
							
							
								
								Friend request message indicator.  
							
							
							
						 
						
							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