8ffb1a0a10 
								
							
								 
							
						 
						
							
							
								
								Refactor session reset handling  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								054a523738 
								
							
								 
							
						 
						
							
							
								
								Fix linked device sending automatic friend request when it already has keys for a device  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								dfb5b0ed9f 
								
							
								 
							
						 
						
							
							
								
								throw instead of log  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0ac79b2275 
								
							
								 
							
						 
						
							
							
								
								convert logging to throws  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								23fe8407ea 
								
							
								 
							
						 
						
							
							
								
								fix typo  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								dbff390035 
								
							
								 
							
						 
						
							
							
								
								improve guards on loading keypair  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								700ed5d2a8 
								
							
								 
							
						 
						
							
							
								
								Some refactoring from reviews, and include the token in the message pipeline instead of getting in message_api  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								fc8aa0211d 
								
							
								 
							
						 
						
							
							
								
								Addressing reviews  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								eec4f22b50 
								
							
								 
							
						 
						
							
							
								
								Add crypto helpers and public error  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								53b974d63f 
								
							
								 
							
						 
						
							
							
								
								Send messages to every devices linked to a primary device  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								a7f999aeb1 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #391  from sachaaaaa/show_seed_errors  
							
							... 
							
							
							
							Report mnemonic errors instead of silent failure 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								1f3f63dcc6 
								
							
								 
							
						 
						
							
							
								
								Report mnemonic error in a toast instead of silently fail  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								701f6be00c 
								
							
								 
							
						 
						
							
							
								
								Add missing mnemonic languages  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								63396669bc 
								
							
								 
							
						 
						
							
							
								
								Add eslint rule to enforce curlys, run eslint --fix to automatically apply this rule and add swapfiles to gitignore  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								37e95cf7d2 
								
							
								 
							
						 
						
							
							
								
								remove unnecessary await  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								03e7fb82e6 
								
							
								 
							
						 
						
							
							
								
								Address reviews  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								6a06e05452 
								
							
								 
							
						 
						
							
							
								
								Fix missing await in periodic NAT hole punching  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								b6dc8b8a7e 
								
							
								 
							
						 
						
							
							
								
								Fix tests for https server  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								abdb232151 
								
							
								 
							
						 
						
							
							
								
								15min TTL and re-punch NAT periodically  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								57b7aaf195 
								
							
								 
							
						 
						
							
							
								
								better handling when upnp not enabled  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								96f7949ac8 
								
							
								 
							
						 
						
							
							
								
								Update endpoint for storage server and p2p  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								ca31649207 
								
							
								 
							
						 
						
							
							
								
								Trial value wasn't being initialised big enough for very low difficulty, also development should not have been there but I don't think it was doing anything  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								52c191fc94 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'development' into clearnet  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9d6c5bff36 
								
							
								 
							
						 
						
							
							
								
								make unverified https queries to the snodes  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f01d8088b7 
								
							
								 
							
						 
						
							
							
								
								Remove development PoW  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e520bf109a 
								
							
								 
							
						 
						
							
							
								
								Persist PoW difficulty and update if get response from snodes  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								bc6586e5ce 
								
							
								 
							
						 
						
							
							
								
								Removed duplicated function.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								582298d9e4 
								
							
								 
							
						 
						
							
							
								
								Remove test which was causing hang.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								7acce268cd 
								
							
								 
							
						 
						
							
							
								
								linting.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f77b67d358 
								
							
								 
							
						 
						
							
							
								
								Updated tests.  
							
							... 
							
							
							
							Fix some minor logic. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ee813a1126 
								
							
								 
							
						 
						
							
							
								
								Update libloki/proof-of-work.js  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b9c11a229b 
								
							
								 
							
						 
						
							
							
								
								Fix tests by handling millisecond ttl better  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								db8f8ba36f 
								
							
								 
							
						 
						
							
							
								
								Multiple all ttl values by 1000 and stop dividing timestamp by 1000 so they are both milliseconds  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								338f4e3682 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #255  from BeaudanBrown/better-logs  
							
							... 
							
							
							
							Improve sending/retrieving/swarm logs 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								c2226542a4 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								e5449f56ee 
								
							
								 
							
						 
						
							
							
								
								Added success and failure callbacks when queueing envelope, now responding with 404 if we fail to decrypt a p2p message  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								6656a89092 
								
							
								 
							
						 
						
							
							
								
								Cleaned up a lot of the logs, stop them from printing more than once etc  
							
							
							
						 
						
							7 years ago