Mikunj
							
						 
						
							 
							
							
							
								
							
								a80d6bb868 
								
							
								 
							
						 
						
							
							
								
								Merged branch correctly.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj Varsani
							
						 
						
							 
							
							
								
								
							
							
								
							
								e4d28fbcb8 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #31  from Mikunj/fix/minor-bug  
							
							 
							
							... 
							
							
							
							Fixed incorrect variable used. 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								40fb7f726f 
								
							
								 
							
						 
						
							
							
								
								Fixed incorrect variable used.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								7887786b00 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #29  from BeaudanBrown/message-polling  
							
							 
							
							... 
							
							
							
							Message server is polled every 5 seconds to check for new messages 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								BeaudanBrown
							
						 
						
							 
							
							
								
								
							
							
								
							
								9ceb3c8ac0 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'development' into message-polling  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								5c93acffe1 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #27  from Mikunj/merge/signal  
							
							 
							
							... 
							
							
							
							Merge new signal changes 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								c59b196487 
								
							
								 
							
						 
						
							
							
								
								Now reading messages and adding them to conversations. Some cleaning of unreachable code. Modified the message data to be encoded as base64 string before sending to server  
							
							 
							
							... 
							
							
							
							Sending our public key in header of message
Now attaching our key to the source field when sending messages, allows messages to be decrypted with the fallback cypher
Now polling the server for messages every 5 seconds
Sending the source device with messages
Added mock respond function to request to leave it that same as the websocket stuff. RetrieveMessages now just returns the result
Polling now continues if the server responds with an error. Returning only the result from sendMessage and retrieveMessages
Revert commenting of unreachable code
Refactored http logic into own file
Revert a change to websocket-resources 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								fca5a74da3 
								
							
								 
							
						 
						
							
							
								
								Fixed review issues.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								0cecbe147c 
								
							
								 
							
						 
						
							
							
								
								Removed todo  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								21f76fa693 
								
							
								 
							
						 
						
							
							
								
								Minor layout fix  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								0a23888875 
								
							
								 
							
						 
						
							
							
								
								Fix up friend request message layout  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								c583819ccf 
								
							
								 
							
						 
						
							
							
								
								Fixed view layouts after deleting a conversation.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								0cf616328e 
								
							
								 
							
						 
						
							
							
								
								Fixed saving prekey bundle once friend request is accepted.  
							
							 
							
							... 
							
							
							
							Added option to delete conversation after it is declined. 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								0a88f337d5 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'sig-development' into merge/signal  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								be1a69c200 
								
							
								 
							
						 
						
							
							
								
								Fix up saving friendRequestStatus  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								c150cbe34f 
								
							
								 
							
						 
						
							
							
								
								Friend request message indicator.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								b9e85bb141 
								
							
								 
							
						 
						
							
							
								
								Added handling of accept and decline events.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								9dc19044b9 
								
							
								 
							
						 
						
							
							
								
								Handle the case where the user is sending a friend request.  
							
							 
							
							... 
							
							
							
							Fix up styling for outgoing message. 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								08ca779fe1 
								
							
								 
							
						 
						
							
							
								
								Fixed up friend request message display  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								5626cfe47d 
								
							
								 
							
						 
						
							
							
								
								Added FriendRequest message  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								1bef7a0c98 
								
							
								 
							
						 
						
							
							
								
								Modified createAccount to only accept params needed for Loki Messenger.  
							
							 
							
							... 
							
							
							
							Removed implementation of registerSecondDevice. 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								b63844af57 
								
							
								 
							
						 
						
							
							
								
								Fix registration.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								59d048ca06 
								
							
								 
							
						 
						
							
							
								
								v1.18.0-beta.6  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								d5154bef73 
								
							
								 
							
						 
						
							
							
								
								Move version 7 schema to version 6.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								e828253ef0 
								
							
								 
							
						 
						
							
							
								
								Restor full function syntax to custom Mocha reporter  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								a2202d7d8c 
								
							
								 
							
						 
						
							
							
								
								Update localization strings  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								dbf0be2db5 
								
							
								 
							
						 
						
							
							
								
								eslintify all test files  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								884bc9333d 
								
							
								 
							
						 
						
							
							
								
								Make timestamp test a bit more forgiving  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								2d48daa7b6 
								
							
								 
							
						 
						
							
							
								
								Refine Sealed Sender behaviors  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								e678d84d7e 
								
							
								 
							
						 
						
							
							
								
								Oops forgot semi colons  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								abe7170b4e 
								
							
								 
							
						 
						
							
							
								
								Added sql deletion of contact pre keys and contact signed pre keys  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								2fabd93fd6 
								
							
								 
							
						 
						
							
							
								
								Fix message sending  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								98185fa6fd 
								
							
								 
							
						 
						
							
							
								
								Added sql migration.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								77602e3dbb 
								
							
								 
							
						 
						
							
							
								
								Moved contactPreKey and contactSignedPreKey to sql.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								525007f944 
								
							
								 
							
						 
						
							
							
								
								Added fetching preKey by recipient.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								1a4adf2281 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'development' into merge/signal  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								c77df8e304 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #26  from Mikunj/feature/public-key-validation  
							
							 
							
							... 
							
							
							
							Public key validation 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								f589fdac5c 
								
							
								 
							
						 
						
							
							
								
								Merge signal changes into branch.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								683d4f4106 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'development' into feature/public-key-validation  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								726f6b11f1 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #25  from loki-project/fix/duplicate-search  
							
							 
							
							... 
							
							
							
							[Fix] User searching 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								61d15fdd57 
								
							
								 
							
						 
						
							
							
								
								Changed == to ===  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								9ea44a5cd2 
								
							
								 
							
						 
						
							
							
								
								fix incorrect error return.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								4e6df71999 
								
							
								 
							
						 
						
							
							
								
								Fix up tests.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								1ccf3b6b95 
								
							
								 
							
						 
						
							
							
								
								Added function to loki_message_api to do a single request call to storage server. Currently just gets called once when the application starts  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								9d342e8951 
								
							
								 
							
						 
						
							
							
								
								Show a message if user types in an invalid public key in search.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								ba1894ec40 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #23  from sachaaaaa/fix_lock  
							
							 
							
							... 
							
							
							
							Always lock editor after sending friend request. unlock if error. 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								28f6992085 
								
							
								 
							
						 
						
							
							
								
								Replaced var with const.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								8d9fbdb3df 
								
							
								 
							
						 
						
							
							
								
								Fix create conversation appearing even if you already have a conversation with the contact.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								1ff1f50e41 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #24  from loki-project/new-url  
							
							 
							
							... 
							
							
							
							Tiny url update to work with the storage server 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								519d372e63 
								
							
								 
							
						 
						
							
							
								
								Tiny url update to work with the storage server  
							
							 
							
							
							
						 
						
							7 years ago