f500fed69c 
								
									
								
							
								 
							
						 
						
							
							
								
								rename missing envelope type FR to SESSION_REQUEST  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								36762dbbf2 
								
							
								 
							
						 
						
							
							
								
								Added libsignal-protocol typings.  
							
							... 
							
							
							
							Added MessageEncrypter. 
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								fa853538d0 
								
									
								
							
								 
							
						 
						
							
							
								
								LINT after prettier upgrade  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								61d4c7c349 
								
							
								 
							
						 
						
							
							
								
								Encrypt source for medium groups  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								96d42e24d2 
								
							
								 
							
						 
						
							
							
								
								Made calculateAgreement async  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d8ed1258e1 
								
							
								 
							
						 
						
							
							
								
								Made key generation async  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								496afa85cb 
								
							
								 
							
						 
						
							
							
								
								Remove libsodium-wrapper.  
							
							... 
							
							
							
							Remove LokiSnodeChannel as we weren't using it. 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0221e7b8c0 
								
							
								 
							
						 
						
							
							
								
								fix linter warnings  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9e3f16301f 
								
							
								 
							
						 
						
							
							
								
								Add AES-GCM  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								1be4123133 
								
							
								 
							
						 
						
							
							
								
								Rename variable to be less confusing  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								942c76ce6b 
								
							
								 
							
						 
						
							
							
								
								Linting  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								820ce5cdf0 
								
							
								 
							
						 
						
							
							
								
								Made session reset synchronous.  
							
							... 
							
							
							
							Clean up some code. 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8ffb1a0a10 
								
							
								 
							
						 
						
							
							
								
								Refactor session reset handling  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								b7e93ab597 
								
							
								 
							
						 
						
							
							
								
								Support sealed sender for friend requests  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								66eae90c38 
								
							
								 
							
						 
						
							
							
								
								refactor verifyAuthorisation out of validateAuthorisation  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f87c9d2222 
								
							
								 
							
						 
						
							
							
								
								Fix up numbers in pairing type.  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								589b3f3233 
								
							
								 
							
						 
						
							
							
								
								Infer pairing message type from the content.  
							
							... 
							
							
							
							This should fix device pairing cross platform. 
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								1f3311bc5d 
								
							
								 
							
						 
						
							
							
								
								Save device mappings upon accepting friend request + various fixes  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								4929f8d8db 
								
							
								 
							
						 
						
							
							
								
								Move high-level authorisation from message_receivier to libloki.crypto  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								a4411007b0 
								
							
								 
							
						 
						
							
							
								
								Pairing authorisations: refactor proto, change sql table, add getters  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d208614909 
								
							
								 
							
						 
						
							
							
								
								Multi-device part 1: make primary account generate and send authorisation to secondary  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9d6c5bff36 
								
							
								 
							
						 
						
							
							
								
								make unverified https queries to the snodes  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								aa722590fa 
								
							
								 
							
						 
						
							
							
								
								use channel encryption with storage server  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								e2abc0d510 
								
							
								 
							
						 
						
							
							
								
								Add channel encryption library with tests (not in used so far)  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								6bd2d3962e 
								
							
								 
							
						 
						
							
							
								
								Linted files  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								982f10a505 
								
							
								 
							
						 
						
							
							
								
								Split libloki logic.  
							
							... 
							
							
							
							Added to gruntfile. 
							
						 
						
							7 years ago