Beaudan
							
						 
						
							 
							
							
							
								
							
								c02d5d4053 
								
							
								 
							
						 
						
							
							
								
								Lint  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								709db4bf54 
								
							
								 
							
						 
						
							
							
								
								Make sendMessage take options, remove redundant retrieve function and get constant  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								b43978ece1 
								
							
								 
							
						 
						
							
							
								
								Initial refactoring of sendmessage  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Campbell-Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								1e11a6527c 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #289  from Mikunj/p2p-ping  
							
							 
							
							... 
							
							
							
							Updated pinging logic. 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Campbell-Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								50c7da4432 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #280  from Mikunj/fix-friend-request-logic  
							
							 
							
							... 
							
							
							
							Fix friend request logic. 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Campbell-Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								fbcd49ac5d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #270  from sachaaaaa/concurrent_polling  
							
							 
							
							... 
							
							
							
							Refactor long polling for better concurrent requests 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								53cbfb1f5c 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'development' into fix-friend-request-logic  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								1b1c18b928 
								
							
								 
							
						 
						
							
							
								
								Patch from Beau  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								147861790b 
								
							
								 
							
						 
						
							
							
								
								Always send application/json as content type in rpc.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								bc6586e5ce 
								
							
								 
							
						 
						
							
							
								
								Removed duplicated function.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								582298d9e4 
								
							
								 
							
						 
						
							
							
								
								Remove test which was causing hang.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								7acce268cd 
								
							
								 
							
						 
						
							
							
								
								linting.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								f77b67d358 
								
							
								 
							
						 
						
							
							
								
								Updated tests.  
							
							 
							
							... 
							
							
							
							Fix some minor logic. 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								986d34bbd9 
								
							
								 
							
						 
						
							
							
								
								linting  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								d4de4b13dd 
								
							
								 
							
						 
						
							
							
								
								Fix incorrect import.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								b4390a8c95 
								
							
								 
							
						 
						
							
							
								
								Updated pinging logic.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Campbell-Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								fdabfc0066 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #285  from BeaudanBrown/old-log  
							
							 
							
							... 
							
							
							
							Remove old log 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								edd5915bf2 
								
							
								 
							
						 
						
							
							
								
								Fix use .length on object  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								5f77f751d9 
								
							
								 
							
						 
						
							
							
								
								Replace generator function and other various fixes  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								09a9cfbf37 
								
							
								 
							
						 
						
							
							
								
								Refactor long polling for better concurrent requests  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								91e218766c 
								
							
								 
							
						 
						
							
							
								
								Remove old log  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Campbell-Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								e99cec9c09 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #272  from Mikunj/signal-1.24  
							
							 
							
							... 
							
							
							
							Signal 1.24 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								12cce8fe47 
								
							
								 
							
						 
						
							
							
								
								Auto accept friend request messages if we were already friends with the user.  
							
							 
							
							... 
							
							
							
							Lint fixes for previous files. 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj Varsani
							
						 
						
							 
							
							
								
								
							
							
								
							
								883b94ff92 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #279  from sachaaaaa/remove_lint_deps  
							
							 
							
							... 
							
							
							
							Skip `lint-deps` on appveyor to prevent build failure 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								990f390f8a 
								
							
								 
							
						 
						
							
							
								
								Skip `lint-deps` on appveyor, which triggers a failed build  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Campbell-Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								ab202f0225 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #278  from BeaudanBrown/silly-typo  
							
							 
							
							... 
							
							
							
							Fix typo 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								beaudan
							
						 
						
							 
							
							
							
								
							
								145b9e0a37 
								
							
								 
							
						 
						
							
							
								
								Fix typo  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Campbell-Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								95cad09253 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #277  from BeaudanBrown/polling-patch  
							
							 
							
							... 
							
							
							
							Polling patch 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								beaudan
							
						 
						
							 
							
							
							
								
							
								6f21e7244f 
								
							
								 
							
						 
						
							
							
								
								Print polling error  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								beaudan
							
						 
						
							 
							
							
							
								
							
								54bd75e9a6 
								
							
								 
							
						 
						
							
							
								
								Wait for a longer time after failed poll and extend default timeout  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj Varsani
							
						 
						
							 
							
							
								
								
							
							
								
							
								d960739ac2 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #273  from fanvyr/patch-1  
							
							 
							
							... 
							
							
							
							update white paper link 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj Varsani
							
						 
						
							 
							
							
								
								
							
							
								
							
								b0f4e627a8 
								
									
								
							
								 
							
						 
						
							
							
								
								Updated whitepaper link  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								5ba190f055 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #269  from loki-project/KeeJef-patch-1  
							
							 
							
							... 
							
							
							
							Update issue templates 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								21ea030f5a 
								
							
								 
							
						 
						
							
							
								
								Removed testing windows release on AppVeyor  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								c3a065c21e 
								
							
								 
							
						 
						
							
							
								
								Remove travis windows.  
							
							 
							
							... 
							
							
							
							Update Appveyor config. 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								fbbf454c49 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'development' into signal-1.24  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Campbell-Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								318371a652 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #264  from BeaudanBrown/remove-signal-references  
							
							 
							
							... 
							
							
							
							Remove Signal references 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								fanvyr
							
						 
						
							 
							
							
								
								
							
							
								
							
								2a56190ad9 
								
									
								
							
								 
							
						 
						
							
							
								
								updated white paper link  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								a8a959b326 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'development' into signal-1.24  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj Varsani
							
						 
						
							 
							
							
								
								
							
							
								
							
								296eb6fd72 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #271  from sachaaaaa/fix_node_tests  
							
							 
							
							... 
							
							
							
							Fix node tests 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								ce4105f529 
								
							
								 
							
						 
						
							
							
								
								Fix node tests  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								61b862b021 
								
							
								 
							
						 
						
							
							
								
								Merge signal 1.24.1  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								3152f92e30 
								
							
								 
							
						 
						
							
							
								
								Merge signal 1.23.2  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	app/sql.js
#	js/conversation_controller.js
#	package.json 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								42c501e7f8 
								
							
								 
							
						 
						
							
							
								
								Merge v1.23.1  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	package.json 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								3a8111020e 
								
							
								 
							
						 
						
							
							
								
								Merge v1.23.0  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	background.html
#	package.json
#	yarn.lock 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								5d916748ae 
								
							
								 
							
						 
						
							
							
								
								Fix styling  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								ef670bec3f 
								
							
								 
							
						 
						
							
							
								
								Ensure that we have all conversations in redux store  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								7387e88c97 
								
							
								 
							
						 
						
							
							
								
								Add showing friends in search.  
							
							 
							
							
							
						 
						
							7 years ago