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  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								e520bf109a 
								
							
								 
							
						 
						
							
							
								
								Persist PoW difficulty and update if get response from snodes  
							
							
							
						 
						
							7 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  
				
					
						
							
							
								 
						
							
							
								62889bbdd4 
								
							
								 
							
						 
						
							
							
								
								Add requestExpired state to Friend Request state machine  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								10ca7ee8d2 
								
							
								 
							
						 
						
							
							
								
								No longer removing listeners when closing local server  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								53b0574a1f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'development' into channel_encryption  
							
							... 
							
							
							
							* development:
  Manually set the dns servers for windows
  Refactor local_loki_server
  Refactor rpc calls to its own function.
# Conflicts:
#	js/modules/loki_message_api.js 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ad5efc9ba3 
								
							
								 
							
						 
						
							
							
								
								lint  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								3285b2d1b9 
								
							
								 
							
						 
						
							
							
								
								Update snode channel tests  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								aa722590fa 
								
							
								 
							
						 
						
							
							
								
								use channel encryption with storage server  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								429bdd6460 
								
							
								 
							
						 
						
							
							
								
								Refactor local_loki_server  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								75d0894104 
								
							
								 
							
						 
						
							
							
								
								Fixed files not included in release.  
							
							... 
							
							
							
							Moved node relevant stuff in libloki into its own modules folder. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								3f755123e7 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #207  from BeaudanBrown/p2p-json-rpc  
							
							... 
							
							
							
							P2p using rpc endpoint 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								7e2a409c43 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #198  from sachaaaaa/channel-encryption  
							
							... 
							
							
							
							Add channel encryption library with tests 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								c0a6ba25bc 
								
							
								 
							
						 
						
							
							
								
								Update p2p messages to follow the same endpoint format as storage server. Clean up message_api a lil bit and updated tests  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								0516e69ff7 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b00a0cb699 
								
							
								 
							
						 
						
							
							
								
								Rename isOnline to isPing for clarity, and reduce the ttl for online broadcast messages to 1 min  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								e2abc0d510 
								
							
								 
							
						 
						
							
							
								
								Add channel encryption library with tests (not in used so far)  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								7186f28019 
								
							
								 
							
						 
						
							
							
								
								Ensure a session is always initiated using the prekey assigned to the contact  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f900a08eda 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #177  from sachaaaaa/merge_1_21_0  
							
							... 
							
							
							
							Merge Signal 1.21.0 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								9ae85a3408 
								
							
								 
							
						 
						
							
							
								
								Add missing argument when calling sendMessage in sendEmptyMessage  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								25a3129e37 
								
							
								 
							
						 
						
							
							
								
								Reworked p2p tests to be sensible and use the built in timeout/done system instead of hacky promise thing  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								cde7bbf3c3 
								
							
								 
							
						 
						
							
							
								
								Removed forceP2p as argument for the pingContact event and enforced it on the other side  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								02d6920ade 
								
							
								 
							
						 
						
							
							
								
								Tests for loki_p2p_api, added yarn command to generate coverage html, instantiating loki_p2p_api in the test preload  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								3c07d99a89 
								
							
								 
							
						 
						
							
							
								
								Fix variable names.  
							
							... 
							
							
							
							Fix module export to be more consistent. 
							
						 
						
							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