sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								53247b8efc 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #247  from sachaaaaa/fix_friend_request_timer  
							
							 
							
							... 
							
							
							
							Fix multiple friend request timers instantiated 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								31cb6b6339 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #249  from sachaaaaa/github_issue_template  
							
							 
							
							... 
							
							
							
							remove github issue template 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								14d070f8c7 
								
							
								 
							
						 
						
							
							
								
								remove github issue template -  fixes   #245  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								7503a8ce6e 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #244  from sachaaaaa/package_json  
							
							 
							
							... 
							
							
							
							Replace mentions of Signal in package json 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								926c9ce3ca 
								
							
								 
							
						 
						
							
							
								
								Fix multiple friend request timers instantiated  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								0d3cd78c12 
								
							
								 
							
						 
						
							
							
								
								Replace mentions of Signal in package json  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								cf8defc731 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #242  from BeaudanBrown/fix-p2p  
							
							 
							
							... 
							
							
							
							Fix p2p 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								10ca7ee8d2 
								
							
								 
							
						 
						
							
							
								
								No longer removing listeners when closing local server  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Campbell-Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								a18625c076 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #240  from BeaudanBrown/fix-ttl-error  
							
							 
							
							... 
							
							
							
							Fix ttl error I introduced 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								0d3c010cf7 
								
							
								 
							
						 
						
							
							
								
								I didn't realise there were 2 different windows between processes and I shouldn't have removed this  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Campbell-Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								8e3542b511 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #213  from sachaaaaa/channel_encryption  
							
							 
							
							... 
							
							
							
							Hook up channel encryption 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Campbell-Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								a8ee027f4a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #239  from BeaudanBrown/missed-lint  
							
							 
							
							... 
							
							
							
							Missed lint line 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								6b1b73a5ea 
								
							
								 
							
						 
						
							
							
								
								Missed lint line  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								4714cafa6f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #238  from sachaaaaa/commit_hash_about  
							
							 
							
							... 
							
							
							
							Show commit hash in About window for beta builds 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								5fb1f2e1c0 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #237  from BeaudanBrown/enter-to-login  
							
							 
							
							... 
							
							
							
							Added enter to log in 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								01577a7b45 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #236  from BeaudanBrown/fix-database-bug  
							
							 
							
							... 
							
							
							
							Fix windows database crash 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								b114f6ac75 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #235  from sachaaaaa/help_menu  
							
							 
							
							... 
							
							
							
							Replace help menu links 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								37f0fced29 
								
							
								 
							
						 
						
							
							
								
								Show commit hash in About window for beta builds  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								f906cbfd50 
								
							
								 
							
						 
						
							
							
								
								Added enter to log in  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								d317b020f0 
								
							
								 
							
						 
						
							
							
								
								Close the database if the password is incorrect, fixes windows crash  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								98aa53de07 
								
							
								 
							
						 
						
							
							
								
								Await removing databse  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								3e66b515de 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #229  from sachaaaaa/fix_buggy_submenu  
							
							 
							
							... 
							
							
							
							Upgrade react-contextmenu to 2.10.0 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								28b548525e 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #233  from BeaudanBrown/handle-local-server-fail  
							
							 
							
							... 
							
							
							
							Retry p2p server if failed to start 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								2278155353 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #234  from BeaudanBrown/fix-ttl-slider  
							
							 
							
							... 
							
							
							
							Fix ttl slider 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								b39b45e29d 
								
							
								 
							
						 
						
							
							
								
								Fix   #214  Replace help menu links  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								5a23dbb687 
								
							
								 
							
						 
						
							
							
								
								Review comments and add local server listener before starting  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								5030ad4021 
								
							
								 
							
						 
						
							
							
								
								Made the slider label populate as well, plus removed redundant window function  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								8c20a31dd4 
								
							
								 
							
						 
						
							
							
								
								Review suggestions  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								eaea7d9b7d 
								
							
								 
							
						 
						
							
							
								
								Catch errors when starting local server and retry every 30 seconds  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								55e0ff1a88 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #208  from Mikunj/message-api-refactor  
							
							 
							
							... 
							
							
							
							Refactor rpc call to its own function. 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								ee8b9b7982 
								
							
								 
							
						 
						
							
							
								
								update react-contextmenu for bugfix  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								e58db0998a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #212  from BeaudanBrown/windows-resolution  
							
							 
							
							... 
							
							
							
							Fix resolution for windows 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								ad5efc9ba3 
								
							
								 
							
						 
						
							
							
								
								lint  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								16b96f3d21 
								
							
								 
							
						 
						
							
							
								
								update yarn.lock  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								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