3ea0689d2f 
								
							
								 
							
						 
						
							
							
								
								Linting  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								e6139a5463 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into message-sending-refactor  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								73e15250d7 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/clearnet' into integration-test-logs-rebased  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								abde96bc1e 
								
							
								 
							
						 
						
							
							
								
								Fix medium group updates  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								fa853538d0 
								
									
								
							
								 
							
						 
						
							
							
								
								LINT after prettier upgrade  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8512c2307b 
								
							
								 
							
						 
						
							
							
								
								Linting  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								50d111f538 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into linked-devs-fixes  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								03757ba2ca 
								
									
								
							
								 
							
						 
						
							
							
								
								lint  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								12b396ce7e 
								
									
								
							
								 
							
						 
						
							
							
								
								add option to send a message to a single device, or to all device except one  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e399b9b65b 
								
									
								
							
								 
							
						 
						
							
							
								
								lint  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								308e06b2cd 
								
									
								
							
								 
							
						 
						
							
							
								
								fix bug since refactor: autoFR and session request message were mixed  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a1f2b38325 
								
							
								 
							
						 
						
							
							
								
								Merge changes  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								eb894a9b66 
								
									
								
							
								 
							
						 
						
							
							
								
								lint  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f46c885fdf 
								
									
								
							
								 
							
						 
						
							
							
								
								merge fix-closed-group to clearnet  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								72c5db52aa 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' of  https://github.com/loki-project/session-desktop  into linked-devs-fixes  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								61d4c7c349 
								
							
								 
							
						 
						
							
							
								
								Encrypt source for medium groups  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								1abf032418 
								
							
								 
							
						 
						
							
							
								
								revert auto-execute  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								dd6b91bb36 
								
							
								 
							
						 
						
							
							
								
								Minor clean-up  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								debb922521 
								
							
								 
							
						 
						
							
							
								
								Medium groups with sender keys essentials  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								861719c269 
								
							
								 
							
						 
						
							
							
								
								remove redundant dewvprod profile  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5f7c82d41d 
								
							
								 
							
						 
						
							
							
								
								Cleanup  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e7e62b2479 
								
							
								 
							
						 
						
							
							
								
								Conditional retry for slave fail  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a708ce56ad 
								
							
								 
							
						 
						
							
							
								
								checkout outgoing  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3de82cd292 
								
							
								 
							
						 
						
							
							
								
								rm  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								b5f0f552a7 
								
							
								 
							
						 
						
							
							
								
								Changes  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2f04a4cf69 
								
							
								 
							
						 
						
							
							
								
								Ignore multi device logic when sending background message  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								875c128d2a 
								
									
								
							
								 
							
						 
						
							
							
								
								remove useSealedSender feature as this is default now  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								edbe79486c 
								
									
								
							
								 
							
						 
						
							
							
								
								split doSendMessage in sub methods  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								24a3e05154 
								
									
								
							
								 
							
						 
						
							
							
								
								Revert "Revert "Clean up unused dependencies.""  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5ff7476359 
								
									
								
							
								 
							
						 
						
							
							
								
								Revert "Clean up unused dependencies."  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9d2417c2f6 
								
							
								 
							
						 
						
							
							
								
								Removed proxy-agent and web-socket.  
							
							... 
							
							
							
							Trimmed down web_api.js to most basic functions we are using. This needs to be completely removed in the future. 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								ebfff824bd 
								
							
								 
							
						 
						
							
							
								
								Fix friend request logic triggerring on session requests  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								33aa190c5b 
								
							
								 
							
						 
						
							
							
								
								Fix friend request for background messages not triggering friend request logic  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								054a523738 
								
							
								 
							
						 
						
							
							
								
								Fix linked device sending automatic friend request when it already has keys for a device  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								c9f60826b4 
								
							
								 
							
						 
						
							
							
								
								Fix friend request messages being sent to users you don't have a session in closed groups.  
							
							... 
							
							
							
							Disable typing messages and read receipts in groups.
Send out session request messages if you don't have a session with a member in the group. 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								dadd4b97ad 
								
							
								 
							
						 
						
							
							
								
								Remove source field from envelope  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9dcc851ebd 
								
							
								 
							
						 
						
							
							
								
								Updated all icon references  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3472a1a938 
								
							
								 
							
						 
						
							
							
								
								Remove unused destinationRegistrationId; lint  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								b7e93ab597 
								
							
								 
							
						 
						
							
							
								
								Support sealed sender for friend requests  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								b405b150cc 
								
							
								 
							
						 
						
							
							
								
								Sealed sender support  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a1a582d7ea 
								
							
								 
							
						 
						
							
							
								
								Session branding fixes  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5fbbdc33c3 
								
							
								 
							
						 
						
							
							
								
								Signal branding  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								db0068b429 
								
							
								 
							
						 
						
							
							
								
								Sending and handling of special UNPAIRING_REQUEST message  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0f74a002df 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #601  from BeaudanBrown/sync-messages  
							
							... 
							
							
							
							[multi-device] Sync messages 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								accd16cae1 
								
							
								 
							
						 
						
							
							
								
								Trigger friend request received update for the correct device conversation, throttle the sending of automated friend requests and don't send them to devices which sent *us* a friend request  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								722c10dd70 
								
							
								 
							
						 
						
							
							
								
								Verify that incoming sync messages are from one of our devices, don't send messages to ourselves  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								d5ddc1c536 
								
							
								 
							
						 
						
							
							
								
								No need to attach authorisation with every friend request  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								7b9e578d8a 
								
							
								 
							
						 
						
							
							
								
								lint  
							
							
							
						 
						
							6 years ago