Mikunj
							
						 
						
							 
							
							
							
								
							
								0404f42738 
								
							
								 
							
						 
						
							
							
								
								Merge commit 'dbdd52b4eb11ca71adcae547c931b5cfda1ada11' into fix/pkb-type  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								dbdd52b4eb 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #50  from Mikunj/fix/friend-request  
							
							 
							
							... 
							
							
							
							Friend request fixes 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								05f8a1c43a 
								
							
								 
							
						 
						
							
							
								
								Handle pkb friend request accept.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								4bb93e6e3c 
								
							
								 
							
						 
						
							
							
								
								rename sendEmptyMessageWithPreKeys to sendFriendRequestAccepted.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								6427ba901f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #51  from sachaaaaa/prekeybundle_type  
							
							 
							
							... 
							
							
							
							add PrekeyBundle Type field in SignalService.proto 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								bd15f426f9 
								
							
								 
							
						 
						
							
							
								
								Attack a type to preKeyBundleMessage.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								b5861a3f5c 
								
							
								 
							
						 
						
							
							
								
								add PrekeyBundle Type field in SignalService.proto  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								f29a515fdf 
								
							
								 
							
						 
						
							
							
								
								Fix up typos.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								4fd709be35 
								
							
								 
							
						 
						
							
							
								
								Removed unused state.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								50e8f65a7e 
								
							
								 
							
						 
						
							
							
								
								updated doc.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								fb8b0e1d40 
								
							
								 
							
						 
						
							
							
								
								Auto accept friend request if we have both incoming and outgoing friend requests.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								8a0b8e1f00 
								
							
								 
							
						 
						
							
							
								
								Store the state of the friend request inside the conversation.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								484efd34a3 
								
							
								 
							
						 
						
							
							
								
								Added friend request message expiration.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								bd103e2ad2 
								
							
								 
							
						 
						
							
							
								
								Minor fixes.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								c9d6a11b1a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #49  from sachaaaaa/log_level  
							
							 
							
							... 
							
							
							
							Use correct log level in development mode 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								7dcef4ee73 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #47  from Mikunj/feature/blocking  
							
							 
							
							... 
							
							
							
							Added blocking and unblocking 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								628ec5fc76 
								
							
								 
							
						 
						
							
							
								
								Updated truncate length to 25.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								db1145c0ce 
								
							
								 
							
						 
						
							
							
								
								Fix handling empty content.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								ccb5ff79d4 
								
							
								 
							
						 
						
							
							
								
								Use correct log level in development mode and use log.debug() for some of the reoccurring logs  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								7d8719f250 
								
							
								 
							
						 
						
							
							
								
								Fix incoming friend request messages being deleted.  
							
							 
							
							... 
							
							
							
							Set pending outgoing friend requests to declined if we receive an incoming friend request.
Fix text input not blocking. 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								dba6a36e83 
								
							
								 
							
						 
						
							
							
								
								removed old unused code.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								75219966a7 
								
							
								 
							
						 
						
							
							
								
								Fixed preKeyBundle decryption.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								b21a7197f7 
								
							
								 
							
						 
						
							
							
								
								Fix preKeyBundle not sending.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								110387508f 
								
							
								 
							
						 
						
							
							
								
								UI fixes.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								4ebdfab633 
								
							
								 
							
						 
						
							
							
								
								Update handling of new message logic.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								6c5c95d956 
								
							
								 
							
						 
						
							
							
								
								Added  preKey decryption.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								1264630649 
								
							
								 
							
						 
						
							
							
								
								Attach preKeyBundle outside of the message content.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								cf3e9716ed 
								
							
								 
							
						 
						
							
							
								
								Update new conditions for friend accepted and key exchange complete in conversations model.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								6689802513 
								
							
								 
							
						 
						
							
							
								
								Truncate text to 15 characters.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								a9c1f628a4 
								
							
								 
							
						 
						
							
							
								
								Switched to using html select.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								5f4a44ba8c 
								
							
								 
							
						 
						
							
							
								
								Remove returning models from block/unblock.  
							
							 
							
							... 
							
							
							
							lint fixes. 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								a3a7f4a621 
								
							
								 
							
						 
						
							
							
								
								Merge commit 'ef44a123ed4ada70489d78fde16a86c60ced34a8' into feature/blocking  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								BeaudanBrown
							
						 
						
							 
							
							
								
								
							
							
								
							
								ef44a123ed 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #48  from BeaudanBrown/cleaning  
							
							 
							
							... 
							
							
							
							Cleaning 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								ff3cc7a315 
								
							
								 
							
						 
						
							
							
								
								Review changes  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								1bb608b55a 
								
							
								 
							
						 
						
							
							
								
								Fixed minor issues.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								04bf00d24f 
								
							
								 
							
						 
						
							
							
								
								Missed semicolon  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								4b16ff755b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'development' of github.com:loki-project/loki-messenger into cleaning  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								489ec8fc65 
								
							
								 
							
						 
						
							
							
								
								Heap of linting, eslint warning/error removal, and fixed a couple small bugs found along the way  
							
							 
							
							... 
							
							
							
							Created new table to store the received message hashes. Checking this table when receiving messages to look for duplicates. Should be cleared of expired messages on app start and every hour after
Removed id which was not needed for seen messages. Refactored filter logic into function and found function name error
create unique index for contact prekeys (to allow using REPLACE)
Fixed lint stuff that merge brought back 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								334be8c169 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #46  from sachaaaaa/fix_insert_or_replace  
							
							 
							
							... 
							
							
							
							create UNIQUE INDEX for contact prekeys (to allow using REPLACE) 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								97d0df9b79 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #45  from BeaudanBrown/filter-messages  
							
							 
							
							... 
							
							
							
							Filtering incoming messages 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								8f7d5611ba 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'development' into feature/blocking  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								dbb92aa9c8 
								
							
								 
							
						 
						
							
							
								
								Added i18n messages.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								5278abefb6 
								
							
								 
							
						 
						
							
							
								
								Removed id which was not needed for seen messages. Refactored filter logic into function and found function name error  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								ba390e354b 
								
							
								 
							
						 
						
							
							
								
								Added unblocking.  
							
							 
							
							... 
							
							
							
							Added styling.
Trigger changes on both conversation and messages when we block/unblock. 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								BeaudanBrown
							
						 
						
							 
							
							
								
								
							
							
								
							
								2188617d2f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #44  from Mikunj/feature/incoming-messages-deleted  
							
							 
							
							... 
							
							
							
							Fix incoming messages being deleted on startup. 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								1bd7c5d862 
								
							
								 
							
						 
						
							
							
								
								create unique index for contact prekeys (to allow using REPLACE)  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								712566ef3b 
								
							
								 
							
						 
						
							
							
								
								Created new table to store the received message hashes. Checking this table when receiving messages to look for duplicates. Should be cleared of expired messages on app start and every hour after  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								658b2b0332 
								
							
								 
							
						 
						
							
							
								
								List blocked users in settings.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								a82999818a 
								
							
								 
							
						 
						
							
							
								
								Added blocking/unblocking from friend request.  
							
							 
							
							... 
							
							
							
							Fixed incoming messages being deleted. 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								ae2e2fa2ae 
								
							
								 
							
						 
						
							
							
								
								Updated UI in conversation to support user blocking behaviour.  
							
							 
							
							
							
						 
						
							7 years ago