8e3542b511 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #213  from sachaaaaa/channel_encryption  
							
							... 
							
							
							
							Hook up channel encryption 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								8c20a31dd4 
								
							
								 
							
						 
						
							
							
								
								Review suggestions  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								53b0574a1f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'development' into channel_encryption  
							
							... 
							
							
							
							* development:
  Manually set the dns servers for windows
  Refactor local_loki_server
  Refactor rpc calls to its own function.
# Conflicts:
#	js/modules/loki_message_api.js 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								55e0ff1a88 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #208  from Mikunj/message-api-refactor  
							
							... 
							
							
							
							Refactor rpc call to its own function. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ad5efc9ba3 
								
							
								 
							
						 
						
							
							
								
								lint  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								aa722590fa 
								
							
								 
							
						 
						
							
							
								
								use channel encryption with storage server  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								72d00e0922 
								
							
								 
							
						 
						
							
							
								
								Manually set the dns servers for windows  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								4a037387e9 
								
							
								 
							
						 
						
							
							
								
								Refactor rpc calls to its own function.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								06be1da40d 
								
							
								 
							
						 
						
							
							
								
								Added p2p message styling  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								c0a6ba25bc 
								
							
								 
							
						 
						
							
							
								
								Update p2p messages to follow the same endpoint format as storage server. Clean up message_api a lil bit and updated tests  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								08dee14802 
								
							
								 
							
						 
						
							
							
								
								Review comment  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								0516e69ff7 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								dc67aaf9cc 
								
							
								 
							
						 
						
							
							
								
								Roll back change to ping more often again, ping our offline contacts every 2 mins to check if they have come back online  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								29bca71d5a 
								
							
								 
							
						 
						
							
							
								
								Try ping contacts that send us storage server messages in the last 2 mins  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								d6a210efaa 
								
							
								 
							
						 
						
							
							
								
								Reworked the update p2p details to be more robust and stopped some redundant pings from happening  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								25ded46e2c 
								
							
								 
							
						 
						
							
							
								
								Fixed some bugs removing nodes after the first failure instead of waiting for the failure count and also reduced the number of errors logged and made some warnings  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b00a0cb699 
								
							
								 
							
						 
						
							
							
								
								Rename isOnline to isPing for clarity, and reduce the ttl for online broadcast messages to 1 min  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								d3f23db049 
								
							
								 
							
						 
						
							
							
								
								serialise objects to json before node-fetch  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								8eac72b60c 
								
							
								 
							
						 
						
							
							
								
								Fix typo  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ed1d06d9ce 
								
							
								 
							
						 
						
							
							
								
								use 'params' as per json_rpc  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								159dc711e1 
								
							
								 
							
						 
						
							
							
								
								use new message json rpc API  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								2fd746821a 
								
							
								 
							
						 
						
							
							
								
								Added function for getting your loki IP and bind the local server  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								6426a5eb9b 
								
							
								 
							
						 
						
							
							
								
								Added ability to look up our .loki address and now send that with our LokiAddress messages  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								2d9e6a7ac8 
								
							
								 
							
						 
						
							
							
								
								Review comments  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								2311bd1328 
								
							
								 
							
						 
						
							
							
								
								Fix bug with swarm node reference, now we should only refresh swarm nodes when they fail  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								5d823de6f9 
								
							
								 
							
						 
						
							
							
								
								Renamed lokiSnodeAPI to start with lower case for consistency, refactor snode API to use conversation controller  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a989a1a818 
								
							
								 
							
						 
						
							
							
								
								Save previews locally.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f900a08eda 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #177  from sachaaaaa/merge_1_21_0  
							
							... 
							
							
							
							Merge Signal 1.21.0 
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								cd79d5aca5 
								
							
								 
							
						 
						
							
							
								
								Fixed and simplified some logic for the handling of loki address messages  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								f4e9bc655a 
								
							
								 
							
						 
						
							
							
								
								Hooked up LokiP2pAPI with online stuff.  
							
							
							
						 
						
							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