9dcc851ebd 
								
							
								 
							
						 
						
							
							
								
								Updated all icon references  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								02320334f0 
								
							
								 
							
						 
						
							
							
								
								Remove P2P  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3472a1a938 
								
							
								 
							
						 
						
							
							
								
								Remove unused destinationRegistrationId; lint  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								b7e93ab597 
								
							
								 
							
						 
						
							
							
								
								Support sealed sender for friend requests  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3b24714f3e 
								
									
								
							
								 
							
						 
						
							
							
								
								Sort messages by sent_at ( #718 )  
							
							... 
							
							
							
							Sort messages by sent_at 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a1a582d7ea 
								
							
								 
							
						 
						
							
							
								
								Session branding fixes  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5fbbdc33c3 
								
							
								 
							
						 
						
							
							
								
								Signal branding  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								033492a200 
								
							
								 
							
						 
						
							
							
								
								Sort messages by sent_at  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								a2e8e6480f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #539  from neuroscr/multidevice-publicchat  
							
							... 
							
							
							
							[multi-device] public chat 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								66eae90c38 
								
							
								 
							
						 
						
							
							
								
								refactor verifyAuthorisation out of validateAuthorisation  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								807f4cbd2a 
								
							
								 
							
						 
						
							
							
								
								Storing primary device pubkey on the conversation model for easier access, ensuring that we accept all the friend requests from the primary conversation rather than the secondary  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								24a687c106 
								
							
								 
							
						 
						
							
							
								
								Throttle the refreshing of device mappings to once every minute  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								f61de2cf8e 
								
							
								 
							
						 
						
							
							
								
								Use first 3 mnemonic words instead of the last 3.  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0f74a002df 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #601  from BeaudanBrown/sync-messages  
							
							... 
							
							
							
							[multi-device] Sync messages 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								15c07ea7df 
								
							
								 
							
						 
						
							
							
								
								Sync secondary devices again but handle the receiving of them properly  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f87c9d2222 
								
							
								 
							
						 
						
							
							
								
								Fix up numbers in pairing type.  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								9ddc237f6d 
								
							
								 
							
						 
						
							
							
								
								show pairing words instead of pubkeys on the primary device's paired devices list.  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								94b0faf2aa 
								
							
								 
							
						 
						
							
							
								
								Remove (hopefully) last place the type of a pairing request is being checked  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8235662518 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #589  from Mikunj/pairing-fix  
							
							... 
							
							
							
							Fix cross platform device linking 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								589b3f3233 
								
							
								 
							
						 
						
							
							
								
								Infer pairing message type from the content.  
							
							... 
							
							
							
							This should fix device pairing cross platform. 
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								17e70bf81c 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'multi-device' into is-secondary-device  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								08ad913105 
								
							
								 
							
						 
						
							
							
								
								Add explicit isSecondary flag to conversation list items so they can remain hidden in the menu after they become friends etc  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								de0a5c7b78 
								
							
								 
							
						 
						
							
							
								
								Unique constraint and prevent some undefined bugs  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d97eced37b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into multi-device  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5710c1268c 
								
							
								 
							
						 
						
							
							
								
								Revert id field and add new url field to be compatible with mobile  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9002c344e3 
								
							
								 
							
						 
						
							
							
								
								TEMPORARY: Disabled sending of contact list sync message to have consistent experience across platforms  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								53bdf14321 
								
							
								 
							
						 
						
							
							
								
								refactor  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								1f3311bc5d 
								
							
								 
							
						 
						
							
							
								
								Save device mappings upon accepting friend request + various fixes  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f268fbb552 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #534  from sachaaaaa/use_file_server_device_mapping  
							
							... 
							
							
							
							[multi-device] Use file server device mapping 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								4929f8d8db 
								
							
								 
							
						 
						
							
							
								
								Move high-level authorisation from message_receivier to libloki.crypto  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5a8ab00a96 
								
							
								 
							
						 
						
							
							
								
								Rename pairing getters to specify secondary or primary. Add getGrantAuthForPrimary.  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f8e9e1d3bd 
								
							
								 
							
						 
						
							
							
								
								Remove rejected authorisation from database  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8ecf057386 
								
							
								 
							
						 
						
							
							
								
								Display list of paired device in modal  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d3653e8665 
								
							
								 
							
						 
						
							
							
								
								lint after manual merge  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								43bd167965 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #463  from loki-project/public-chat  
							
							... 
							
							
							
							Public chat 
							
						 
						
							6 years ago