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  
				
					
						
							
							
								 
						
							
							
								0d7480bd92 
								
							
								 
							
						 
						
							
							
								
								A number of small fixes for Link Previews  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								432c336048 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #171  from Mikunj/online-indicator-fix  
							
							... 
							
							
							
							Added online indicator to conversation header. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ddfc99a461 
								
							
								 
							
						 
						
							
							
								
								Added online indicator to conversation header.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								e3c0f2147a 
								
							
								 
							
						 
						
							
							
								
								Fixed variable name.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1d40bc3af9 
								
							
								 
							
						 
						
							
							
								
								Changed queueMessageSend to use JobQueue.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								4518e95619 
								
							
								 
							
						 
						
							
							
								
								Linting  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f4e9bc655a 
								
							
								 
							
						 
						
							
							
								
								Hooked up LokiP2pAPI with online stuff.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								9b382de6da 
								
							
								 
							
						 
						
							
							
								
								Added online indicator.  
							
							... 
							
							
							
							Disable selection in contacts. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a40a3d164f 
								
							
								 
							
						 
						
							
							
								
								Lots of logic for establishing a p2p connection, managing when the other user is online vs offline etc. Will always try to use P2P messaging when it can and fall back to storage server otherwise  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								9ff96a0250 
								
							
								 
							
						 
						
							
							
								
								Fixed tests and moved friend request status enum to new friends file  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								07076c27ae 
								
							
								 
							
						 
						
							
							
								
								Moved friend status to window, added start of p2p api stuff  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1533fcc807 
								
							
								 
							
						 
						
							
							
								
								Fail over to all numbers in retry if errors don't have numbers  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								c936859d09 
								
							
								 
							
						 
						
							
							
								
								Fix rendering bug with verified state in updateVerified()  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								dde63a552f 
								
							
								 
							
						 
						
							
							
								
								Fix bug with replayable errors, fix bug with set representation of swarmNodes not being handled properly  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								813924685e 
								
							
								 
							
						 
						
							
							
								
								Link Previews  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								dcfc97713b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #150  from sachaaaaa/display_nickname_on_friend_accept  
							
							... 
							
							
							
							Send profile along with friend request accept message 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								adfb4ab371 
								
							
								 
							
						 
						
							
							
								
								work with session reset  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1a15ec9c15 
								
							
								 
							
						 
						
							
							
								
								Merge commit signal/master into signal-1.20  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								e08a63d078 
								
							
								 
							
						 
						
							
							
								
								Merge development into lint  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f92e8485f8 
								
							
								 
							
						 
						
							
							
								
								Merge development into lint  
							
							... 
							
							
							
							Added gitattributes 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								bdbdf15469 
								
							
								 
							
						 
						
							
							
								
								Added timeouts for requests so they don't for ages. Changed swarmNodes to be a set to work property with merge, now removing contact swarmNodes if they timeout  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								7b1799c418 
								
							
								 
							
						 
						
							
							
								
								Big ol' hunk o' chunk. Now using random.snode to populate swarm lists, now making multiple requests from said lists and they are processed as they complete rather than waiting for all to resolve  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f09f0f5721 
								
							
								 
							
						 
						
							
							
								
								Moved replenishSwarm into libloki-protocol and attached to the window  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								37ba762312 
								
							
								 
							
						 
						
							
							
								
								First stuff for contacting specific nodes for each contact. Hard coded to hit the same bootstrap node for now plus doesn't handle unreachable nodes/errors well yet  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ea1d007b4f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #136  from Mikunj/tests  
							
							... 
							
							
							
							Tests 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								6bd2d3962e 
								
							
								 
							
						 
						
							
							
								
								Linted files  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								feb8af476a 
								
							
								 
							
						 
						
							
							
								
								Refactored BlockedNumberController.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								7341471ce7 
								
							
								 
							
						 
						
							
							
								
								Fix up notification.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								faeb319c58 
								
							
								 
							
						 
						
							
							
								
								Added profile model test.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								61c4447ab0 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #126  from Mikunj/friend-request-notification  
							
							... 
							
							
							
							Fix notification display after friend request is accepted. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a12ed61cc1 
								
							
								 
							
						 
						
							
							
								
								Fix notification display after friend request is accepted.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								070d18b514 
								
							
								 
							
						 
						
							
							
								
								Updated function calls.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								c0be4718fc 
								
							
								 
							
						 
						
							
							
								
								Update delivered_to for outgoing with earlier delivery receipts  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a21d63e450 
								
							
								 
							
						 
						
							
							
								
								Make notification initials consistent with everything else ( #3006 )  
							
							... 
							
							
							
							Make notification initials consistent with Avatar component 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								6bcb259919 
								
							
								 
							
						 
						
							
							
								
								Added PoW error.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								654b0dac84 
								
							
								 
							
						 
						
							
							
								
								Merge signal-master.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f98fe910d5 
								
							
								 
							
						 
						
							
							
								
								Fix friend request retry not working.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								3851bf351f 
								
							
								 
							
						 
						
							
							
								
								Throttle typing events, fix profile logging, fix group typing  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								2715e79268 
								
							
								 
							
						 
						
							
							
								
								Fix conversation status not being reset upon conversation messages deletion.  
							
							... 
							
							
							
							Fix incoming friend request not replacing old friend requests.
Fixed incorrect function name. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								05c18d42db 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #66  from sachaaaaa/session_reset  
							
							... 
							
							
							
							Handle session reset, Loki style 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1e3886cca8 
								
							
								 
							
						 
						
							
							
								
								More consistent naming of key storage functions, moved some loki messenger only functions into new file  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								86e04b89e2 
								
							
								 
							
						 
						
							
							
								
								Update js/models/conversations.js  
							
							... 
							
							
							
							Co-Authored-By: sachaaaaa <40749766+sachaaaaa@users.noreply.github.com> 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								e62c661ed9 
								
							
								 
							
						 
						
							
							
								
								Treat session reset success messages as incoming, handle failure differently  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								962c947605 
								
							
								 
							
						 
						
							
							
								
								Prevent "secure session reset succeeded" message from being cleaned up at startup  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f2e1b9b8de 
								
							
								 
							
						 
						
							
							
								
								more missing awaits  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								df80249cba 
								
							
								 
							
						 
						
							
							
								
								fix missing awaits  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								4cc614269e 
								
							
								 
							
						 
						
							
							
								
								add setter for session reset state  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1dc621a917 
								
							
								 
							
						 
						
							
							
								
								Fix using FriendStatusEnum for session reset  
							
							... 
							
							
							
							Co-Authored-By: sachaaaaa <40749766+sachaaaaa@users.noreply.github.com> 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								7e612700f7 
								
							
								 
							
						 
						
							
							
								
								Handle session reset, Loki style  
							
							
							
						 
						
							7 years ago