Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								73e15250d7 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/clearnet' into integration-test-logs-rebased  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								a656e3ba3f 
								
									
								
							
								 
							
						 
						
							
							
								
								add env variable to enable message_logs  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								a857406728 
								
									
								
							
								 
							
						 
						
							
							
								
								rename respondToAll.. FR to updateAll...Messages at is does not send any messages  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								abde96bc1e 
								
							
								 
							
						 
						
							
							
								
								Fix medium group updates  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								2a0130ff04 
								
							
								 
							
						 
						
							
							
								
								Multidevice support for medium groups  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								12b396ce7e 
								
									
								
							
								 
							
						 
						
							
							
								
								add option to send a message to a single device, or to all device except one  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								a1f2b38325 
								
							
								 
							
						 
						
							
							
								
								Merge changes  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								a497871ea3 
								
							
								 
							
						 
						
							
							
								
								Made changes for new protocol  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								f46c885fdf 
								
									
								
							
								 
							
						 
						
							
							
								
								merge fix-closed-group to clearnet  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								a7def71840 
								
									
								
							
								 
							
						 
						
							
							
								
								multi device: do not sync contacts not friends  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								6d03a63d4a 
								
									
								
							
								 
							
						 
						
							
							
								
								add sync of open groups on device link  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								0eaebcbcac 
								
							
								 
							
						 
						
							
							
								
								Don't send contact sync message with pairing authorisation.  
							
							 
							
							... 
							
							
							
							Don't send secondary devices in contact sync messages. 
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								f35493ce9f 
								
							
								 
							
						 
						
							
							
								
								Linting  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								abf298ba25 
								
							
								 
							
						 
						
							
							
								
								Added sending of group sync message  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								b61dd6a839 
								
							
								 
							
						 
						
							
							
								
								Don't send groups in contact sync message  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								02320334f0 
								
							
								 
							
						 
						
							
							
								
								Remove P2P  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								3472a1a938 
								
							
								 
							
						 
						
							
							
								
								Remove unused destinationRegistrationId; lint  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								033492a200 
								
							
								 
							
						 
						
							
							
								
								Sort messages by sent_at  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								7c52a1d038 
								
							
								 
							
						 
						
							
							
								
								encrypt and decrypt images before upload and after download  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								db0068b429 
								
							
								 
							
						 
						
							
							
								
								Sending and handling of special UNPAIRING_REQUEST message  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								74045d58d7 
								
							
								 
							
						 
						
							
							
								
								Use Int32 for the contact list buffer  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Campbell-Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								deedcc1d64 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #606  from BeaudanBrown/contact-sync  
							
							 
							
							... 
							
							
							
							[multi-device]Contact syncing 
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								843c5b5ebc 
								
							
								 
							
						 
						
							
							
								
								Fix contact status in createContactSyncProtoMessage  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								370dee5abb 
								
							
								 
							
						 
						
							
							
								
								Ensure we have the correct apis and listeners during the pairing process. Catch upnp error. Remove redundant friend requests  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								332cd30052 
								
							
								 
							
						 
						
							
							
								
								Send contact sync message when becoming friends with contact and auto accept/send friend requests when receiving contact sync  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								15c07ea7df 
								
							
								 
							
						 
						
							
							
								
								Sync secondary devices again but handle the receiving of them properly  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								7e275ac266 
								
							
								 
							
						 
						
							
							
								
								Don't sync secondary devices and make sure initAPIs has been called before sending friend requests to synced contacts  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								f16b032056 
								
							
								 
							
						 
						
							
							
								
								Handle sync messages properly for some edge cases, ensure we always have a primaryDevicePubKey, send contact sync message  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								94b0faf2aa 
								
							
								 
							
						 
						
							
							
								
								Remove (hopefully) last place the type of a pairing request is being checked  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								de0a5c7b78 
								
							
								 
							
						 
						
							
							
								
								Unique constraint and prevent some undefined bugs  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								9002c344e3 
								
							
								 
							
						 
						
							
							
								
								TEMPORARY: Disabled sending of contact list sync message to have consistent experience across platforms  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								b10835ffc7 
								
							
								 
							
						 
						
							
							
								
								Share contact upon authorising secondary device  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								9beea2cbd3 
								
							
								 
							
						 
						
							
							
								
								Enforce curlies completely and lint with new settings  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								ef6b22f6b9 
								
							
								 
							
						 
						
							
							
								
								Simplify and lint  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								1ea934d69c 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #457  from sachaaaaa/share_profile_name  
							
							 
							
							... 
							
							
							
							[multi-device] Share primary device profile name upon secondary registration 
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								97970ff465 
								
							
								 
							
						 
						
							
							
								
								Share primary device profile name upon secondary registration  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								aa2438ad00 
								
							
								 
							
						 
						
							
							
								
								Shorter TTL for pairing requests  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								a2463f74c3 
								
							
								 
							
						 
						
							
							
								
								Improve object validation in createPairingAuthorisationProtoMessage  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								a4411007b0 
								
							
								 
							
						 
						
							
							
								
								Pairing authorisations: refactor proto, change sql table, add getters  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								bf8bb23683 
								
							
								 
							
						 
						
							
							
								
								remove stale comment and simplify conversation creation  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								d208614909 
								
							
								 
							
						 
						
							
							
								
								Multi-device part 1: make primary account generate and send authorisation to secondary  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								df2c4af67c 
								
							
								 
							
						 
						
							
							
								
								Run lint and check for ip or address when removing unreachable nodes  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								580931c4fb 
								
							
								 
							
						 
						
							
							
								
								Pass ourKey to message api, initialise these APIs after registration or when storage is ready so we always have ourKey  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								beac7a02bb 
								
							
								 
							
						 
						
							
							
								
								send "unreachable" ping to allow half-p2p  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								c53633e367 
								
							
								 
							
						 
						
							
							
								
								Clearnet p2p with https (no verification yet)  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								e7b2448087 
								
							
								 
							
						 
						
							
							
								
								Prevent sending broadcast to ourselves at startup  
							
							 
							
							
							
						 
						
							6 years ago