7c52a1d038 
								
							
								 
							
						 
						
							
							
								
								encrypt and decrypt images before upload and after download  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								db0068b429 
								
							
								 
							
						 
						
							
							
								
								Sending and handling of special UNPAIRING_REQUEST message  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								74045d58d7 
								
							
								 
							
						 
						
							
							
								
								Use Int32 for the contact list buffer  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								deedcc1d64 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #606  from BeaudanBrown/contact-sync  
							
							... 
							
							
							
							[multi-device]Contact syncing 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								843c5b5ebc 
								
							
								 
							
						 
						
							
							
								
								Fix contact status in createContactSyncProtoMessage  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								370dee5abb 
								
							
								 
							
						 
						
							
							
								
								Ensure we have the correct apis and listeners during the pairing process. Catch upnp error. Remove redundant friend requests  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								c31535edb4 
								
							
								 
							
						 
						
							
							
								
								Rename blockSync, only send contacts and profile if sending a GRANT request, do *not* always be friends with secondary devices because we still need to complete a friend request exchange  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								332cd30052 
								
							
								 
							
						 
						
							
							
								
								Send contact sync message when becoming friends with contact and auto accept/send friend requests when receiving contact sync  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								15c07ea7df 
								
							
								 
							
						 
						
							
							
								
								Sync secondary devices again but handle the receiving of them properly  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								7e275ac266 
								
							
								 
							
						 
						
							
							
								
								Don't sync secondary devices and make sure initAPIs has been called before sending friend requests to synced contacts  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f16b032056 
								
							
								 
							
						 
						
							
							
								
								Handle sync messages properly for some edge cases, ensure we always have a primaryDevicePubKey, send contact sync message  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								94b0faf2aa 
								
							
								 
							
						 
						
							
							
								
								Remove (hopefully) last place the type of a pairing request is being checked  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								883feb668d 
								
							
								 
							
						 
						
							
							
								
								The rest of my multidevice work, send messages to all the correct devices and automatic friend request if not friends with a device  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								de0a5c7b78 
								
							
								 
							
						 
						
							
							
								
								Unique constraint and prevent some undefined bugs  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9002c344e3 
								
							
								 
							
						 
						
							
							
								
								TEMPORARY: Disabled sending of contact list sync message to have consistent experience across platforms  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0426d85e7a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into multi-device  
							
							... 
							
							
							
							* clearnet: (136 commits)
  Fix more check on deletion.
  Only shorten pubkeys if name is present
  Shorten pubkeys in quotations too
  better guard
  pass serverId back to the server
  Bump version.
  Purge cache on failure.
  Fix unnecessary link preview fetches.
  Review changes. Increase mod time to 30 seconds.
  Undo defaultPublicChatServer change,
  Modified colour of dark mod badge
  Linting.
  Updated design
  Show crown icon for moderators
  Fix last hash all being NULL in database
  Poll for moderators, store them on the conversation and use the list to determine our own mod status
  Make sure we are always updating the last deleted id
  Update ts/components/conversation/FriendRequest.md
  Fix  #355  Display timestamp for friend requests
  Fix duplicate detection for sent messages in public chat
  ...
# Conflicts:
#	app/sql.js
#	js/background.js
#	js/models/messages.js
#	js/views/app_view.js
#	libloki/crypto.js
#	libtextsecure/message_receiver.js 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								b10835ffc7 
								
							
								 
							
						 
						
							
							
								
								Share contact upon authorising secondary device  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9beea2cbd3 
								
							
								 
							
						 
						
							
							
								
								Enforce curlies completely and lint with new settings  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								ef6b22f6b9 
								
							
								 
							
						 
						
							
							
								
								Simplify and lint  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								1ea934d69c 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #457  from sachaaaaa/share_profile_name  
							
							... 
							
							
							
							[multi-device] Share primary device profile name upon secondary registration 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								97970ff465 
								
							
								 
							
						 
						
							
							
								
								Share primary device profile name upon secondary registration  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								aa2438ad00 
								
							
								 
							
						 
						
							
							
								
								Shorter TTL for pairing requests  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a2463f74c3 
								
							
								 
							
						 
						
							
							
								
								Improve object validation in createPairingAuthorisationProtoMessage  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a4411007b0 
								
							
								 
							
						 
						
							
							
								
								Pairing authorisations: refactor proto, change sql table, add getters  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								bf8bb23683 
								
							
								 
							
						 
						
							
							
								
								remove stale comment and simplify conversation creation  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d208614909 
								
							
								 
							
						 
						
							
							
								
								Multi-device part 1: make primary account generate and send authorisation to secondary  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								96aaa7851d 
								
							
								 
							
						 
						
							
							
								
								Send broadcast message instead of empty message to trigger things like session reset and disappearing messages. Also fix small bug where deleting a contact kept the (now removed) conversation open  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								df2c4af67c 
								
							
								 
							
						 
						
							
							
								
								Run lint and check for ip or address when removing unreachable nodes  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								580931c4fb 
								
							
								 
							
						 
						
							
							
								
								Pass ourKey to message api, initialise these APIs after registration or when storage is ready so we always have ourKey  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								beac7a02bb 
								
							
								 
							
						 
						
							
							
								
								send "unreachable" ping to allow half-p2p  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								c53633e367 
								
							
								 
							
						 
						
							
							
								
								Clearnet p2p with https (no verification yet)  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e7b2448087 
								
							
								 
							
						 
						
							
							
								
								Prevent sending broadcast to ourselves at startup  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								6656a89092 
								
							
								 
							
						 
						
							
							
								
								Cleaned up a lot of the logs, stop them from printing more than once etc  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b00a0cb699 
								
							
								 
							
						 
						
							
							
								
								Rename isOnline to isPing for clarity, and reduce the ttl for online broadcast messages to 1 min  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								2fd746821a 
								
							
								 
							
						 
						
							
							
								
								Added function for getting your loki IP and bind the local server  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								6426a5eb9b 
								
							
								 
							
						 
						
							
							
								
								Added ability to look up our .loki address and now send that with our LokiAddress messages  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								9ae85a3408 
								
							
								 
							
						 
						
							
							
								
								Add missing argument when calling sendMessage in sendEmptyMessage  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a40a3d164f 
								
							
								 
							
						 
						
							
							
								
								Lots of logic for establishing a p2p connection, managing when the other user is online vs offline etc. Will always try to use P2P messaging when it can and fall back to storage server otherwise  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								6ba7fb20b8 
								
							
								 
							
						 
						
							
							
								
								Fixed UI blocking when creating conversation, more review comments  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								e735b3ca41 
								
							
								 
							
						 
						
							
							
								
								Review comments, moved swarmNodes database stuff to just be in data.js  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								9ff96a0250 
								
							
								 
							
						 
						
							
							
								
								Fixed tests and moved friend request status enum to new friends file  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								38ff70e2ec 
								
							
								 
							
						 
						
							
							
								
								Fixed some little redundant stuff in the message and snode api  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								2bae6b5eed 
								
							
								 
							
						 
						
							
							
								
								Removed online broadcast message type, changed ttl logic a little, add p2p address and port to the window object when recieve message  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								07076c27ae 
								
							
								 
							
						 
						
							
							
								
								Moved friend status to window, added start of p2p api stuff  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b417edfc9b 
								
							
								 
							
						 
						
							
							
								
								Added new protos for online broadcast messages, added db hits for getting friends, local server now instantiated on the window, now sending online broadcast messages when the local server starts  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								adfb4ab371 
								
							
								 
							
						 
						
							
							
								
								work with session reset  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1238cbc4e6 
								
							
								 
							
						 
						
							
							
								
								Send profile along with friend request accept message  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								6bd2d3962e 
								
							
								 
							
						 
						
							
							
								
								Linted files  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								982f10a505 
								
							
								 
							
						 
						
							
							
								
								Split libloki logic.  
							
							... 
							
							
							
							Added to gruntfile. 
							
						 
						
							7 years ago