7564e270f8 
								
							
								 
							
						 
						
							
							
								
								Lint and code cleanup  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								725a41a8d7 
								
							
								 
							
						 
						
							
							
								
								Added link preview setting.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								27c6062351 
								
							
								 
							
						 
						
							
							
								
								Fix incoming messages not showing previews.  
							
							... 
							
							
							
							Linting. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ae695fe32f 
								
							
								 
							
						 
						
							
							
								
								Remove sending attachments.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								8f8e25bb3e 
								
							
								 
							
						 
						
							
							
								
								Added local link preview  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								0417f0ffad 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #182  from sachaaaaa/disable_dragndro  
							
							... 
							
							
							
							Disable drag n drop temporarily 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f900a08eda 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #177  from sachaaaaa/merge_1_21_0  
							
							... 
							
							
							
							Merge Signal 1.21.0 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								72b7f82522 
								
							
								 
							
						 
						
							
							
								
								Disable pasting files  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								46533fae0d 
								
							
								 
							
						 
						
							
							
								
								disable drag n drop temporarily  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								4332a18fcb 
								
							
								 
							
						 
						
							
							
								
								ran yarn lint  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								cde7bbf3c3 
								
							
								 
							
						 
						
							
							
								
								Removed forceP2p as argument for the pingContact event and enforced it on the other side  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								69ebf017ff 
								
							
								 
							
						 
						
							
							
								
								Reworked loki_p2p_api to not use the window object, which means it needs to be instantiated after the storage is ready so that your pubkey can be passed in to the constructor. This makes it more modular and allows for easier testing  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								1519406c65 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #169  from Mikunj/queue-message-send-update  
							
							... 
							
							
							
							Minor code update 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								e3c0f2147a 
								
							
								 
							
						 
						
							
							
								
								Fixed variable name.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								0c104e5a53 
								
							
								 
							
						 
						
							
							
								
								Small fix for the disconnected banner coming up when it shouldn't, just default to thinking we are connected and mock the onEmpty event. Will only get set to not connected if requests fail  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								926362f88a 
								
							
								 
							
						 
						
							
							
								
								Rename queue_manager to job_queue  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1d40bc3af9 
								
							
								 
							
						 
						
							
							
								
								Changed queueMessageSend to use JobQueue.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								cd79d5aca5 
								
							
								 
							
						 
						
							
							
								
								Fixed and simplified some logic for the handling of loki address messages  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b2e95932f1 
								
							
								 
							
						 
						
							
							
								
								Lint  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								fac8e72861 
								
							
								 
							
						 
						
							
							
								
								Added queue manager to properly fix the race condition bug and reset the changes I made in other commit  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b2f456031f 
								
							
								 
							
						 
						
							
							
								
								Forgot to lint  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								25383458b1 
								
							
								 
							
						 
						
							
							
								
								Fixed bug with our swarm nodes being removed from memory after a successful request because of returning a reference  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								cc3f98b20a 
								
							
								 
							
						 
						
							
							
								
								Move the incoming hash filtering logic into sql.js to prevent data races  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								5f49c5aafd 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #165  from Mikunj/online-indicator  
							
							... 
							
							
							
							Online indicator 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								174f8747b6 
								
							
								 
							
						 
						
							
							
								
								Review fixes.  
							
							... 
							
							
							
							Revert promises back to old style. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								576617e18e 
								
							
								 
							
						 
						
							
							
								
								call class method using "this" in loki_snode_api  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								4518e95619 
								
							
								 
							
						 
						
							
							
								
								Linting  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								8526c6dd92 
								
							
								 
							
						 
						
							
							
								
								Fix up possible database write issue.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f4e9bc655a 
								
							
								 
							
						 
						
							
							
								
								Hooked up LokiP2pAPI with online stuff.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								9b382de6da 
								
							
								 
							
						 
						
							
							
								
								Added online indicator.  
							
							... 
							
							
							
							Disable selection in contacts. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1ce63add68 
								
							
								 
							
						 
						
							
							
								
								Simplified the addContactP2pDetails logic cause it was silly  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								efe95a70bc 
								
							
								 
							
						 
						
							
							
								
								Fix review issues.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								3c07d99a89 
								
							
								 
							
						 
						
							
							
								
								Fix variable names.  
							
							... 
							
							
							
							Fix module export to be more consistent. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ddbbb1a6f0 
								
							
								 
							
						 
						
							
							
								
								Refactor fetch.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								6ba7fb20b8 
								
							
								 
							
						 
						
							
							
								
								Fixed UI blocking when creating conversation, more review comments  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								e735b3ca41 
								
							
								 
							
						 
						
							
							
								
								Review comments, moved swarmNodes database stuff to just be in data.js  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								4207d2d26b 
								
							
								 
							
						 
						
							
							
								
								Removed accidental commented out line  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								9ff96a0250 
								
							
								 
							
						 
						
							
							
								
								Fixed tests and moved friend request status enum to new friends file  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								38ff70e2ec 
								
							
								 
							
						 
						
							
							
								
								Fixed some little redundant stuff in the message and snode api  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								d002d76d9f 
								
							
								 
							
						 
						
							
							
								
								Fix unneccesary logic and copy paste trash  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								2bae6b5eed 
								
							
								 
							
						 
						
							
							
								
								Removed online broadcast message type, changed ttl logic a little, add p2p address and port to the window object when recieve message  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								07076c27ae 
								
							
								 
							
						 
						
							
							
								
								Moved friend status to window, added start of p2p api stuff  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b417edfc9b 
								
							
								 
							
						 
						
							
							
								
								Added new protos for online broadcast messages, added db hits for getting friends, local server now instantiated on the window, now sending online broadcast messages when the local server starts  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								8f165da43d 
								
							
								 
							
						 
						
							
							
								
								Fix sending loop that cycles indefinitely when offline  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f2acde219a 
								
							
								 
							
						 
						
							
							
								
								Review suggestion  
							
							
							
						 
						
							7 years ago