b05d2e6725 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' of  https://github.com/loki-project/session-desktop  into https-open-group  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								d5cfcf9edc 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1223  from Bilb/various-closed-group-fixes  
							
							... 
							
							
							
							* fix display name and avatar to be shown when message is coming from a secondary device
* fix show of expiretimer in the group conversation when it is for it.
* fix a bug creating empty conversation when sync closed group message is received on secondary device
* trigger an expiretimer update message to all members when updating a group.
* trigger an expiretimer update message when sending back group details (after a requestGroupInfo) 
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								39b41cb222 
								
							
								 
							
						 
						
							
							
								
								joining-open-groups  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								ae35626b35 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1221  from msgmaxim/ts-onion-requests  
							
							... 
							
							
							
							Move onion requests to typescript 
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								f11e0f2cd0 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1222  from Mikunj/blocking  
							
							... 
							
							
							
							Fix up Blocking 
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								a02aa75f1f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/clearnet' into various-closed-group-fixes  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								15b8600e25 
								
									
								
							
								 
							
						 
						
							
							
								
								fix display name and avatar not being updated when message from secondary  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								aa75205bbd 
								
							
								 
							
						 
						
							
							
								
								Move BlockedNumberController to ts  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								12f73e23f2 
								
							
								 
							
						 
						
							
							
								
								Move onion requests to typescript  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								600653d3d6 
								
							
								 
							
						 
						
							
							
								
								allow cancel linking  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								ed48818867 
								
									
								
							
								 
							
						 
						
							
							
								
								include old avatar and expireTimer on groupUpdate  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								0386259fce 
								
							
								 
							
						 
						
							
							
								
								cancelling linked  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								6e1f3fdc75 
								
							
								 
							
						 
						
							
							
								
								linked-devices-limit  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								cf8ff24535 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1212  from msgmaxim/remove-dead-code  
							
							... 
							
							
							
							Clean up dead code 
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								514d60b1cf 
								
							
								 
							
						 
						
							
							
								
								Clean up dead code  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								269c87a42e 
								
							
								 
							
						 
						
							
							
								
								Fix closed group issues  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								255c7ada68 
								
							
								 
							
						 
						
							
							
								
								More clean up in message_receiver.js  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								0904e7a8ca 
								
							
								 
							
						 
						
							
							
								
								Refactor from message polling to content message handling  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								347a1e5582 
								
							
								 
							
						 
						
							
							
								
								Add avatar uploading to attachment utils  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								5f2990d088 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1197  from Bilb/other-messages-new-sending  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								24f86de087 
								
									
								
							
								 
							
						 
						
							
							
								
								use SyncMessage when we are only sending a syncMessage  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								8b4e69739d 
								
									
								
							
								 
							
						 
						
							
							
								
								adress review  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								13811233b6 
								
							
								 
							
						 
						
							
							
								
								Add session request expiry checks  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								9941c12586 
								
									
								
							
								 
							
						 
						
							
							
								
								finish adding mediumGroupUpdates  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								b0ed0207e0 
								
									
								
							
								 
							
						 
						
							
							
								
								fix one to one (session) chats with just the body set  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								c783e14a86 
								
									
								
							
								 
							
						 
						
							
							
								
								move sync request messages types to new pipeline  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								fbba5575ba 
								
									
								
							
								 
							
						 
						
							
							
								
								remove buildSessionRequest message  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								c947d99369 
								
									
								
							
								 
							
						 
						
							
							
								
								getMessageQueue() rather than .messageQueue to avoid startup issue  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								b42bc05270 
								
									
								
							
								 
							
						 
						
							
							
								
								replace unlink message  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								4865b72e93 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/clearnet' into receiver-remove-friend-request-logic  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								28fb1dd12a 
								
									
								
							
								 
							
						 
						
							
							
								
								address PR reviews  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								eb9a838af1 
								
									
								
							
								 
							
						 
						
							
							
								
								remove friends from UI logic  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								bccdc3cf34 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/clearnet' into receiver-remove-friend-request-logic  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								0275d43fa4 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into multi-device-protocol  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								68b119fb69 
								
									
								
							
								 
							
						 
						
							
							
								
								remove FR logic from receiver and background.js  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								7a6ea97efb 
								
							
								 
							
						 
						
							
							
								
								Handle strings in MultiDeviceProtocol  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								8ca7b8cfb4 
								
							
								 
							
						 
						
							
							
								
								Message receiving refactor: handleDataMessage onwards  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								b36b3e7725 
								
							
								 
							
						 
						
							
							
								
								Slowly replace old multi device functions  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								c8414fdce6 
								
							
								 
							
						 
						
							
							
								
								Simplify sql and data files  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								a22dbbc37e 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into fileonion  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								e6139a5463 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into message-sending-refactor  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								626a108a64 
								
									
								
							
								 
							
						 
						
							
							
								
								do not update a group by default as a medium group  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								73e15250d7 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/clearnet' into integration-test-logs-rebased  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								2d26479177 
								
									
								
							
								 
							
						 
						
							
							
								
								lint  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								93581874b8 
								
									
								
							
								 
							
						 
						
							
							
								
								trigger afr to all users devices if needed on contactSync\  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								a857406728 
								
									
								
							
								 
							
						 
						
							
							
								
								rename respondToAll.. FR to updateAll...Messages at is does not send any messages  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								13c41f83fe 
								
							
								 
							
						 
						
							
							
								
								Address more review comments  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								ec3c03dbd4 
								
							
								 
							
						 
						
							
							
								
								Address review comments  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								abde96bc1e 
								
							
								 
							
						 
						
							
							
								
								Fix medium group updates  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2a0130ff04 
								
							
								 
							
						 
						
							
							
								
								Multidevice support for medium groups  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3561ac49c0 
								
							
								 
							
						 
						
							
							
								
								UI and some integrations tests for sender keys  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								fa853538d0 
								
									
								
							
								 
							
						 
						
							
							
								
								LINT after prettier upgrade  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								fe7b22dbc3 
								
							
								 
							
						 
						
							
							
								
								Groups not friends  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								54ee9e3ad4 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' of  https://github.com/loki-project/loki-messenger  into fileonion  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								291ae531d9 
								
							
								 
							
						 
						
							
							
								
								lint  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d695c57805 
								
									
								
							
								 
							
						 
						
							
							
								
								wait to delete secondaryDevice conversation after unpairing  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3c6e58e54b 
								
							
								 
							
						 
						
							
							
								
								build paths if useFileOnionRequests is on and useOnionRequests is not  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e5e71c4577 
								
							
								 
							
						 
						
							
							
								
								move window.LokiPublicChatAPI.setClockParams() out  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								7c87519048 
								
									
								
							
								 
							
						 
						
							
							
								
								send syncMessage when we just created a closed group  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								308e06b2cd 
								
									
								
							
								 
							
						 
						
							
							
								
								fix bug since refactor: autoFR and session request message were mixed  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5b79f715ba 
								
									
								
							
								 
							
						 
						
							
							
								
								integration-test fix some tests add tests of logs  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								eb894a9b66 
								
									
								
							
								 
							
						 
						
							
							
								
								lint  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f46c885fdf 
								
									
								
							
								 
							
						 
						
							
							
								
								merge fix-closed-group to clearnet  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								ead2f62b6d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into sender-keys  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5c02dc9371 
								
							
								 
							
						 
						
							
							
								
								sorting-tinkers  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								61d4c7c349 
								
							
								 
							
						 
						
							
							
								
								Encrypt source for medium groups  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a5b1101216 
								
							
								 
							
						 
						
							
							
								
								Slave unlinking & FR dup fix  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								debb922521 
								
							
								 
							
						 
						
							
							
								
								Medium groups with sender keys essentials  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3f650a1d15 
								
							
								 
							
						 
						
							
							
								
								prevent note to self on unlink from slave  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3e3df7717f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1094  from Bilb/link-device-fixes  
							
							... 
							
							
							
							Link device fixes 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								cf05d4ff6c 
								
							
								 
							
						 
						
							
							
								
								revivify  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								6f8affe5c9 
								
									
								
							
								 
							
						 
						
							
							
								
								add spinner while unlinking device  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								035daffe2b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1074  from Bilb/various-group-fixes  
							
							... 
							
							
							
							Various group fixes 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8f453bc12e 
								
							
								 
							
						 
						
							
							
								
								Fix unnecessary db calls  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a3575c0295 
								
									
								
							
								 
							
						 
						
							
							
								
								showtoast on invite accept from already member open-group  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								18851c3f87 
								
							
								 
							
						 
						
							
							
								
								Move builing paths after storage becomes ready.  
							
							... 
							
							
							
							We do this so it doesn't block any of the other communication apis from being initialized. 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								6cda163b27 
								
							
								 
							
						 
						
							
							
								
								upgrade typescript  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								24a3e05154 
								
									
								
							
								 
							
						 
						
							
							
								
								Revert "Revert "Clean up unused dependencies.""  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5ff7476359 
								
									
								
							
								 
							
						 
						
							
							
								
								Revert "Clean up unused dependencies."  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								c5ffcf1c3b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into package-cleanup  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9d2417c2f6 
								
							
								 
							
						 
						
							
							
								
								Removed proxy-agent and web-socket.  
							
							... 
							
							
							
							Trimmed down web_api.js to most basic functions we are using. This needs to be completely removed in the future. 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								24114bab8d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1024  from Bilb/fix-pre-approved-friend-request  
							
							... 
							
							
							
							fix pre approved friend requests 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e48c7c2f3d 
								
									
								
							
								 
							
						 
						
							
							
								
								fix lint  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8f01d1dbb7 
								
									
								
							
								 
							
						 
						
							
							
								
								enable by default spell-check  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e64ae7db5f 
								
									
								
							
								 
							
						 
						
							
							
								
								fixes   #989  pre approved friend requests  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9ff16d7e60 
								
									
								
							
								 
							
						 
						
							
							
								
								move to electron spellchecker  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a91d925384 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1000  from msgmaxim/onion-requests  
							
							... 
							
							
							
							Client-side implementation for onion requests 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d8a12aab0f 
								
							
								 
							
						 
						
							
							
								
								conv tinkering  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3a746109ea 
								
							
								 
							
						 
						
							
							
								
								Path building for onion requests  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								b3d895caf3 
								
									
								
							
								 
							
						 
						
							
							
								
								Toast on device pairing request received but in device pairing mode  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								bb7d4820a5 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #959  from neuroscr/opengroupordering  
							
							... 
							
							
							
							open group avatar redo conversion properly 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f599c28470 
								
							
								 
							
						 
						
							
							
								
								organisation  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								33925d69e9 
								
							
								 
							
						 
						
							
							
								
								Cleanup  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d8b982e194 
								
							
								 
							
						 
						
							
							
								
								Fix messages not being created properly in open groups  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9a6aafe99c 
								
							
								 
							
						 
						
							
							
								
								Pull from clearnet  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								7235ccff88 
								
							
								 
							
						 
						
							
							
								
								Emoji quick styling  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8c91aa04f1 
								
							
								 
							
						 
						
							
							
								
								Speed up message creation.  
							
							... 
							
							
							
							We were fetching all of our devices everytime a new message was received.
This was only used for when the message was a public chat message, so i moved it into the relevant if statement.
In the future if we increase the device link limit, we'll need to fetch all our devices on application launch or something. 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								26140e0ed0 
								
							
								 
							
						 
						
							
							
								
								Send delivery receipts asynchronously  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								745e898bcc 
								
							
								 
							
						 
						
							
							
								
								Remove more unused functions  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d5bb069207 
								
							
								 
							
						 
						
							
							
								
								Cleanup unused functions  
							
							
							
						 
						
							6 years ago