e6139a5463 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into message-sending-refactor  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								e9e5a1508d 
								
									
								
							
								 
							
						 
						
							
							
								
								exclude secondary FR from FR results  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								fa853538d0 
								
									
								
							
								 
							
						 
						
							
							
								
								LINT after prettier upgrade  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								1cd716d053 
								
							
								 
							
						 
						
							
							
								
								Removed comments  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								34ecc5a751 
								
							
								 
							
						 
						
							
							
								
								Finalisation; working FRs from secondary;  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								19cf4fa54b 
								
							
								 
							
						 
						
							
							
								
								Set profile name  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								60ddaa14be 
								
							
								 
							
						 
						
							
							
								
								Prevent multiple FR conversations  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a668be33d7 
								
							
								 
							
						 
						
							
							
								
								remove lodash  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								ca910be1ef 
								
							
								 
							
						 
						
							
							
								
								removed comments  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								08e223e96e 
								
							
								 
							
						 
						
							
							
								
								final w comments  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2b0ea5bcc5 
								
							
								 
							
						 
						
							
							
								
								simplificaiton  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								843be3921e 
								
							
								 
							
						 
						
							
							
								
								finalised  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								10ccea5ec8 
								
							
								 
							
						 
						
							
							
								
								tight filtering  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								7d803280e8 
								
							
								 
							
						 
						
							
							
								
								halfway  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2b7df8e40b 
								
							
								 
							
						 
						
							
							
								
								Filtering groups fromstate  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								20feb23017 
								
							
								 
							
						 
						
							
							
								
								small lint fix in search.ts  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								366acae1cd 
								
							
								 
							
						 
						
							
							
								
								Minor Fix check if from is invalid not just null  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								87aee6286d 
								
							
								 
							
						 
						
							
							
								
								Implement requested minor changes  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								048ca2d405 
								
							
								 
							
						 
						
							
							
								
								fix lint in search.ts  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3eca4025e7 
								
							
								 
							
						 
						
							
							
								
								Fix lint in search.ts  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f770d4ed44 
								
							
								 
							
						 
						
							
							
								
								lint  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8f7083f5a2 
								
							
								 
							
						 
						
							
							
								
								Update Advanced Search by easier date formats  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								c11a96ad01 
								
							
								 
							
						 
						
							
							
								
								lint  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8c32bb93f7 
								
							
								 
							
						 
						
							
							
								
								Implement Advanced Search (from, before and after)  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								7a86a68c22 
								
									
								
							
								 
							
						 
						
							
							
								
								enable back note to self in search result  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								06aeb126c2 
								
									
								
							
								 
							
						 
						
							
							
								
								enable search by username in message view  #928  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								25d0fff95f 
								
							
								 
							
						 
						
							
							
								
								fix build  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e4a4a333ba 
								
							
								 
							
						 
						
							
							
								
								do not show friends with conversation.activeAt undeifned  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5797365886 
								
							
								 
							
						 
						
							
							
								
								remove useless !important flag  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								29c7f0ebe4 
								
							
								 
							
						 
						
							
							
								
								userSearchDropdown, display only friends and not all contacts  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								902e678a64 
								
							
								 
							
						 
						
							
							
								
								fix lint  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2335dbab93 
								
							
								 
							
						 
						
							
							
								
								remove MainHeader class no longer used  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								4377737642 
								
							
								 
							
						 
						
							
							
								
								fix error with undefined message when searching  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								7cac734ff5 
								
							
								 
							
						 
						
							
							
								
								count globally number of message unread in selector  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								31b98b71be 
								
							
								 
							
						 
						
							
							
								
								enable back search results on messages content  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								73041ccef3 
								
							
								 
							
						 
						
							
							
								
								show receivedFriendRequest in a popup  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e4b36fe7f7 
								
							
								 
							
						 
						
							
							
								
								add start of user search dropdown in compose view  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f241440855 
								
							
								 
							
						 
						
							
							
								
								conversation search: do not show user or friends results  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								225f002648 
								
							
								 
							
						 
						
							
							
								
								add conversations with working search on leftpanel  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								685ada5cc5 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into prep-merge  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								006f817faa 
								
							
								 
							
						 
						
							
							
								
								make linter happy  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								c9e3757381 
								
							
								 
							
						 
						
							
							
								
								dial the logging down a notch  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8d6fee4aec 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into multi-device  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8be1c61f4c 
								
							
								 
							
						 
						
							
							
								
								Highlight conversations with unread mentions of the user  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								d3c3184405 
								
							
								 
							
						 
						
							
							
								
								Search returns primary device when looking up secondary pub key  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								66459ac4bd 
								
							
								 
							
						 
						
							
							
								
								Remove most of the right click and cog menu options for the public chats  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								b5aee4f4be 
								
							
								 
							
						 
						
							
							
								
								Display "Pair New Device" in menu for non-secondary devices  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								662c64f347 
								
							
								 
							
						 
						
							
							
								
								Remove ability to delete some rss conversations  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								c57571fdfd 
								
							
								 
							
						 
						
							
							
								
								loki.network rss feed  
							
							
							
						 
						
							6 years ago