d12f6b6d32 
								
							
								 
							
						 
						
							
							
								
								Handle swarm nodes the same for us or contacts, attach our key to message api object  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								4330e48185 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #307  from BeaudanBrown/fix-self-note  
							
							... 
							
							
							
							Fix not to self 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e1d2484797 
								
							
								 
							
						 
						
							
							
								
								Can't update conversation that hasn't been created yet  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								ab15a4afd6 
								
							
								 
							
						 
						
							
							
								
								Review moving status setting to conversation init  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3bb9d888dc 
								
							
								 
							
						 
						
							
							
								
								Initialise conversation with ourselves as friends and don't allow it to be changed to anything else  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								94b125f2cf 
								
							
								 
							
						 
						
							
							
								
								Consider friend requests that are still being sent as sent  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								ca31649207 
								
							
								 
							
						 
						
							
							
								
								Trial value wasn't being initialised big enough for very low difficulty, also development should not have been there but I don't think it was doing anything  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0948a344d2 
								
							
								 
							
						 
						
							
							
								
								Review refactor  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d5546b9473 
								
							
								 
							
						 
						
							
							
								
								Lint  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								b6b0248e9d 
								
							
								 
							
						 
						
							
							
								
								Retrieve from seed  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								1f74088586 
								
							
								 
							
						 
						
							
							
								
								Send to IP  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								6b2b9ce926 
								
							
								 
							
						 
						
							
							
								
								Remove default port and use port from storage server responses  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								eea2b8e6a7 
								
							
								 
							
						 
						
							
							
								
								Do port null check inside rpc call  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								52c191fc94 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'development' into clearnet  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9d6c5bff36 
								
							
								 
							
						 
						
							
							
								
								make unverified https queries to the snodes  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								7141847dfb 
								
							
								 
							
						 
						
							
							
								
								Restart sendMessage logic if PoW changed an dfix NaN bug  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f01d8088b7 
								
							
								 
							
						 
						
							
							
								
								Remove development PoW  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								dad52a784d 
								
							
								 
							
						 
						
							
							
								
								Change wrong pow http response  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								dbcaaf98dc 
								
							
								 
							
						 
						
							
							
								
								Lint  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								c27d1ef69a 
								
							
								 
							
						 
						
							
							
								
								Clean some stuff in loki_rpc and get new difficulty from successful requests  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								e520bf109a 
								
							
								 
							
						 
						
							
							
								
								Persist PoW difficulty and update if get response from snodes  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								e9b1359bab 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #295  from BeaudanBrown/refactor-sendmessage  
							
							... 
							
							
							
							Refactor sendmessage 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								18a87d5463 
								
							
								 
							
						 
						
							
							
								
								Review changes  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								fd6f6c6a8c 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #290  from Mikunj/loki-profile  
							
							... 
							
							
							
							Convert profile field in DataMessage to use LokiProfile 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								c02d5d4053 
								
							
								 
							
						 
						
							
							
								
								Lint  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								709db4bf54 
								
							
								 
							
						 
						
							
							
								
								Make sendMessage take options, remove redundant retrieve function and get constant  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b43978ece1 
								
							
								 
							
						 
						
							
							
								
								Initial refactoring of sendmessage  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1e11a6527c 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #289  from Mikunj/p2p-ping  
							
							... 
							
							
							
							Updated pinging logic. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								50c7da4432 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #280  from Mikunj/fix-friend-request-logic  
							
							... 
							
							
							
							Fix friend request logic. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								2c12c8a1d8 
								
							
								 
							
						 
						
							
							
								
								Convert profile field in data message to use LokiProfile instead of signal Contact.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								53cbfb1f5c 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'development' into fix-friend-request-logic  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1b1c18b928 
								
							
								 
							
						 
						
							
							
								
								Patch from Beau  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								147861790b 
								
							
								 
							
						 
						
							
							
								
								Always send application/json as content type in rpc.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								bc6586e5ce 
								
							
								 
							
						 
						
							
							
								
								Removed duplicated function.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f77b67d358 
								
							
								 
							
						 
						
							
							
								
								Updated tests.  
							
							... 
							
							
							
							Fix some minor logic. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								986d34bbd9 
								
							
								 
							
						 
						
							
							
								
								linting  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								d4de4b13dd 
								
							
								 
							
						 
						
							
							
								
								Fix incorrect import.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b4390a8c95 
								
							
								 
							
						 
						
							
							
								
								Updated pinging logic.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								edd5915bf2 
								
							
								 
							
						 
						
							
							
								
								Fix use .length on object  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								5f77f751d9 
								
							
								 
							
						 
						
							
							
								
								Replace generator function and other various fixes  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								09a9cfbf37 
								
							
								 
							
						 
						
							
							
								
								Refactor long polling for better concurrent requests  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								e99cec9c09 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #272  from Mikunj/signal-1.24  
							
							... 
							
							
							
							Signal 1.24 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								12cce8fe47 
								
							
								 
							
						 
						
							
							
								
								Auto accept friend request messages if we were already friends with the user.  
							
							... 
							
							
							
							Lint fixes for previous files. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								54bd75e9a6 
								
							
								 
							
						 
						
							
							
								
								Wait for a longer time after failed poll and extend default timeout  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								fbbf454c49 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'development' into signal-1.24  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								318371a652 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #264  from BeaudanBrown/remove-signal-references  
							
							... 
							
							
							
							Remove Signal references 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b8ef6c2cc6 
								
							
								 
							
						 
						
							
							
								
								Loki changes  
							
							... 
							
							
							
							Added friends section in search.
This is because contacts is now used in signal for something else and we don't want to clash meanings.
Styling fixes
Add dropdown options into mainheader
Updated styling
Restore StartNewConversation to the old ui style of loki messenger.
Fix friend search display.
Fix header expand animation.
Hooked up menu actions.
Linting.
More styling changes.
Fix tests.
Added back in the loki logo below the gutter.
Fix toast positioning.
Fix context menu showing incorrectly on virtual lists.
Added tabs.
Linting 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								61b862b021 
								
							
								 
							
						 
						
							
							
								
								Merge signal 1.24.1  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								8808100796 
								
							
								 
							
						 
						
							
							
								
								Merge signal-1.24.0  
							
							... 
							
							
							
							# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	background.html
#	config/default.json
#	config/production.json
#	js/models/conversations.js
#	js/models/messages.js
#	js/views/conversation_view.js
#	js/views/inbox_view.js
#	js/views/settings_view.js
#	main.js
#	package.json
#	test/index.html
#	ts/components/conversation/ContactName.tsx
#	yarn.lock 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								3152f92e30 
								
							
								 
							
						 
						
							
							
								
								Merge signal 1.23.2  
							
							... 
							
							
							
							# Conflicts:
#	app/sql.js
#	js/conversation_controller.js
#	package.json 
							
						 
						
							7 years ago