dca2462f6c 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #248  from sachaaaaa/friend_request_expiry  
							
							... 
							
							
							
							Add requestExpired state to Friend Request state machine 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								77fb5b4a71 
								
							
								 
							
						 
						
							
							
								
								Missing closing parenthesis  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								353302ca16 
								
									
								
							
								 
							
						 
						
							
							
								
								Use Array.includes instead of Array.indexOf  
							
							... 
							
							
							
							Co-Authored-By: sachaaaaa <40749766+sachaaaaa@users.noreply.github.com> 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								e953ae7be2 
								
							
								 
							
						 
						
							
							
								
								use correct function respondToAllFriendRequests  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								62889bbdd4 
								
							
								 
							
						 
						
							
							
								
								Add requestExpired state to Friend Request state machine  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								926c9ce3ca 
								
							
								 
							
						 
						
							
							
								
								Fix multiple friend request timers instantiated  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								8e3542b511 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #213  from sachaaaaa/channel_encryption  
							
							... 
							
							
							
							Hook up channel encryption 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								4714cafa6f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #238  from sachaaaaa/commit_hash_about  
							
							... 
							
							
							
							Show commit hash in About window for beta builds 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								37f0fced29 
								
							
								 
							
						 
						
							
							
								
								Show commit hash in About window for beta builds  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f906cbfd50 
								
							
								 
							
						 
						
							
							
								
								Added enter to log in  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								28b548525e 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #233  from BeaudanBrown/handle-local-server-fail  
							
							... 
							
							
							
							Retry p2p server if failed to start 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								5030ad4021 
								
							
								 
							
						 
						
							
							
								
								Made the slider label populate as well, plus removed redundant window function  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								1c4d9b40bb 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #199  from sachaaaaa/new_message_api  
							
							... 
							
							
							
							Use new message json rpc API 
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								4bb10044ea 
								
							
								 
							
						 
						
							
							
								
								Clear timers after friend request complete and don't do timer related things if we are already friends  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								d30e950bf9 
								
							
								 
							
						 
						
							
							
								
								Changed hashing algorithm.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a989a1a818 
								
							
								 
							
						 
						
							
							
								
								Save previews locally.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1a7df91dbc 
								
							
								 
							
						 
						
							
							
								
								Fix: Navigation to message via quote click didn't always work  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a1e4b740f2 
								
							
								 
							
						 
						
							
							
								
								Fixed up settings view.  
							
							... 
							
							
							
							Fix review issues. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								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