sachaaaaa
							
						 
						
							 
							
							
							
								
							
								3285b2d1b9 
								
							
								 
							
						 
						
							
							
								
								Update snode channel tests  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								aa722590fa 
								
							
								 
							
						 
						
							
							
								
								use channel encryption with storage server  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								72d00e0922 
								
							
								 
							
						 
						
							
							
								
								Manually set the dns servers for windows  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Kee Jefferys
							
						 
						
							 
							
							
								
								
							
							
								
							
								0500bb6f4f 
								
									
								
							
								 
							
						 
						
							
							
								
								Update links and wording  
							
							 
							
							... 
							
							
							
							remove mixnet terminology 
add lokinet link 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								9f7964ac6d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #202  from Mikunj/message-p2p  
							
							 
							
							... 
							
							
							
							Added p2p message styling 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								429bdd6460 
								
							
								 
							
						 
						
							
							
								
								Refactor local_loki_server  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								4a037387e9 
								
							
								 
							
						 
						
							
							
								
								Refactor rpc calls to its own function.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								0fdc116068 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #210  from Mikunj/release-fix  
							
							 
							
							... 
							
							
							
							Fix release build not working 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								75d0894104 
								
							
								 
							
						 
						
							
							
								
								Fixed files not included in release.  
							
							 
							
							... 
							
							
							
							Moved node relevant stuff in libloki into its own modules folder. 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Campbell-Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								014193e737 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #209  from BeaudanBrown/fix-windows-cd  
							
							 
							
							... 
							
							
							
							Fix windows gitlab cd 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								8aa258b2ea 
								
							
								 
							
						 
						
							
							
								
								Set the windows cd to look in the release folder instead of dist  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								9ac76e7e62 
								
							
								 
							
						 
						
							
							
								
								Linting  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								06be1da40d 
								
							
								 
							
						 
						
							
							
								
								Added p2p message styling  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								3f755123e7 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #207  from BeaudanBrown/p2p-json-rpc  
							
							 
							
							... 
							
							
							
							P2p using rpc endpoint 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								5e73e23f47 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #205  from BeaudanBrown/update-production  
							
							 
							
							... 
							
							
							
							Point production build at lokinet 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Campbell-Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								7e2a409c43 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #198  from sachaaaaa/channel-encryption  
							
							 
							
							... 
							
							
							
							Add channel encryption library with tests 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								ffdc50c290 
								
							
								 
							
						 
						
							
							
								
								lint haha  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								403df0806b 
								
							
								 
							
						 
						
							
							
								
								Update the production json to just use the defaults in preparation for having other people try the messenger. Also cleaned up a little log that was incorrect  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								888d5f1eda 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #203  from BeaudanBrown/optimise-pinging  
							
							 
							
							... 
							
							
							
							Optimise pinging 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								08dee14802 
								
							
								 
							
						 
						
							
							
								
								Review comment  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								0516e69ff7 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								29bca71d5a 
								
							
								 
							
						 
						
							
							
								
								Try ping contacts that send us storage server messages in the last 2 mins  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								d6a210efaa 
								
							
								 
							
						 
						
							
							
								
								Reworked the update p2p details to be more robust and stopped some redundant pings from happening  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								b00a0cb699 
								
							
								 
							
						 
						
							
							
								
								Rename isOnline to isPing for clarity, and reduce the ttl for online broadcast messages to 1 min  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								1c4d9b40bb 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #199  from sachaaaaa/new_message_api  
							
							 
							
							... 
							
							
							
							Use new message json rpc API 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								46f376e5d6 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #201  from BeaudanBrown/friend-timer-fix  
							
							 
							
							... 
							
							
							
							Fix friend request timer bug 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								d3f23db049 
								
							
								 
							
						 
						
							
							
								
								serialise objects to json before node-fetch  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								8eac72b60c 
								
							
								 
							
						 
						
							
							
								
								Fix typo  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								ed1d06d9ce 
								
							
								 
							
						 
						
							
							
								
								use 'params' as per json_rpc  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								4bb10044ea 
								
							
								 
							
						 
						
							
							
								
								Clear timers after friend request complete and don't do timer related things if we are already friends  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								159dc711e1 
								
							
								 
							
						 
						
							
							
								
								use new message json rpc API  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								e2abc0d510 
								
							
								 
							
						 
						
							
							
								
								Add channel encryption library with tests (not in used so far)  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								0460c62847 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #196  from BeaudanBrown/localhost-loki  
							
							 
							
							... 
							
							
							
							Localhost loki 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								a7e2685091 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #193  from sachaaaaa/readme-linux  
							
							 
							
							... 
							
							
							
							Update contributing.md for hunspell on linux 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								2fd746821a 
								
							
								 
							
						 
						
							
							
								
								Added function for getting your loki IP and bind the local server  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								6426a5eb9b 
								
							
								 
							
						 
						
							
							
								
								Added ability to look up our .loki address and now send that with our LokiAddress messages  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								92ff7a1995 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #195  from BeaudanBrown/remove-auto-line-endings  
							
							 
							
							... 
							
							
							
							Stop git from defaulting to changing line endings 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								43d347d9f1 
								
							
								 
							
						 
						
							
							
								
								Stop git from defaulting to changing line endings  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								2f3fa0166e 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #194  from sachaaaaa/fix-line-ending  
							
							 
							
							... 
							
							
							
							Fix line endings in libsignal-protocol 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								6febbf83da 
								
							
								 
							
						 
						
							
							
								
								reset line endings in libsignal-protocol  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								b95bc6e433 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #188  from sachaaaaa/merge_1_21_1  
							
							 
							
							... 
							
							
							
							Merge 1.21.1 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								4e8d00508e 
								
							
								 
							
						 
						
							
							
								
								update contributing.md for hunspell on linux  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								68fe552156 
								
							
								 
							
						 
						
							
							
								
								Merge commit '5c8558e293989094693f918a63b672301f1aeb55' into merge_1_21_1  
							
							 
							
							... 
							
							
							
							* commit '5c8558e293989094693f918a63b672301f1aeb55':
  v1.21.1
  v1.21.1-beta.1
  Fix: Navigation to message via quote click didn't always work
  mainWindow.close - be ready for null mainWindow
  Ensure that Curve.async points to worker after startWorker call
  Protect against unhandled promises when calling checkForUpdates
  Reenable send when link preview is missing an image
# Conflicts:
#	package.json 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								a5871f56b3 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #187  from BeaudanBrown/swarm-fixes  
							
							 
							
							... 
							
							
							
							Swarm fixes 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								2d9e6a7ac8 
								
							
								 
							
						 
						
							
							
								
								Review comments  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								2311bd1328 
								
							
								 
							
						 
						
							
							
								
								Fix bug with swarm node reference, now we should only refresh swarm nodes when they fail  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								5d823de6f9 
								
							
								 
							
						 
						
							
							
								
								Renamed lokiSnodeAPI to start with lower case for consistency, refactor snode API to use conversation controller  
							
							 
							
							
							
						 
						
							7 years ago