Beaudan
							
						 
						
							 
							
							
							
								
							
								3aa135fdb4 
								
							
								 
							
						 
						
							
							
								
								Grabbing last hash from server response. only requesting messages after the lasthash. Keeping track of lasthash for array of nodes (currently hardcoded for one)  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								BeaudanBrown
							
						 
						
							 
							
							
								
								
							
							
								
							
								bd0ce981dd 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #34  from sachaaaaa/classify  
							
							 
							
							... 
							
							
							
							ES2015 classes for LokiServer and FallBackSessionCipher 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								2af2baa54a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #35  from sachaaaaa/multi-window  
							
							 
							
							... 
							
							
							
							Allow multiple instances running for debugging 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								d41b2594dd 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #33  from Mikunj/feature/friend-request  
							
							 
							
							... 
							
							
							
							Friend request redesign inside the conversation view 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								33ee45b819 
								
							
								 
							
						 
						
							
							
								
								Cleaned up SQL for getMessagesByConversation.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								f2dbdff548 
								
							
								 
							
						 
						
							
							
								
								code cleanup.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								f9efd0da68 
								
							
								 
							
						 
						
							
							
								
								allow multiple instances running for debugging  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								dc1e42a2e4 
								
							
								 
							
						 
						
							
							
								
								Removed unneeded comment :)  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								1150f0f915 
								
							
								 
							
						 
						
							
							
								
								Allow fetching conversation messages by a specific type.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								ad1cf94526 
								
							
								 
							
						 
						
							
							
								
								ES2015 classes for LokiServer and FallBackSessionCipher  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								4b7a94c7d0 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'development' into feature/friend-request  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								f4b60c3ff6 
								
							
								 
							
						 
						
							
							
								
								Fix setting friend requests incorrectly.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								d6534e1bb8 
								
							
								 
							
						 
						
							
							
								
								Fixed bug with signed key sig not being saved  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								5e48efc935 
								
							
								 
							
						 
						
							
							
								
								Merge commit 'd94365f1c6dbb315f67f29b47982b5f24bd11f5f' into feature/friend-request  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								557fed11f3 
								
							
								 
							
						 
						
							
							
								
								Only display retry send button if the request is pending.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								6aab900da2 
								
							
								 
							
						 
						
							
							
								
								Handle friend request updated.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								4d08a74d53 
								
							
								 
							
						 
						
							
							
								
								Updated FriendRequest to be more consistent with the other typescript components.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								f45e0030c4 
								
							
								 
							
						 
						
							
							
								
								Added status display and retry send to friend request.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								7530836110 
								
							
								 
							
						 
						
							
							
								
								Send message status in friend request props.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								757216fe80 
								
							
								 
							
						 
						
							
							
								
								Fix text input disabling.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								2a83c8710c 
								
							
								 
							
						 
						
							
							
								
								Fix up sending friend requests.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								fc3cb9c46d 
								
							
								 
							
						 
						
							
							
								
								Replace old pending messages with new one when adding a new incoming friend request.  
							
							 
							
							... 
							
							
							
							More refactoring. 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								d5fafd4d78 
								
							
								 
							
						 
						
							
							
								
								refactor friend request message props  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								a80d6bb868 
								
							
								 
							
						 
						
							
							
								
								Merged branch correctly.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								BeaudanBrown
							
						 
						
							 
							
							
								
								
							
							
								
							
								d94365f1c6 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #30  from sachaaaaa/fix_enum_clash  
							
							 
							
							... 
							
							
							
							change FRIEND_REQUEST value to prevent clash with upstream 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								BeaudanBrown
							
						 
						
							 
							
							
								
								
							
							
								
							
								61d3c3244c 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #32  from sachaaaaa/disable_signal_stuff  
							
							 
							
							... 
							
							
							
							Comment out signal-specific logic introduced in latest merge 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								2451ffdca4 
								
							
								 
							
						 
						
							
							
								
								Comment out signal-specific logic introduced in latest merge  
							
							 
							
							
							
						 
						
							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
							
						 
						
							 
							
							
							
								
							
								c605fff58d 
								
							
								 
							
						 
						
							
							
								
								change FRIEND_REQUEST value to prevent clash with upstream  
							
							 
							
							
							
						 
						
							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