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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								7cac734ff5 
								
							
								 
							
						 
						
							
							
								
								count globally number of message unread in selector  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								73041ccef3 
								
							
								 
							
						 
						
							
							
								
								show receivedFriendRequest in a popup  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f241440855 
								
							
								 
							
						 
						
							
							
								
								conversation search: do not show user or friends results  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								b5aee4f4be 
								
							
								 
							
						 
						
							
							
								
								Display "Pair New Device" in menu for non-secondary devices  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								b8ef6c2cc6 
								
							
								 
							
						 
						
							
							
								
								Loki changes  
							
							... 
							
							
							
							Added friends section in search.
This is because contacts is now used in signal for something else and we don't want to clash meanings.
Styling fixes
Add dropdown options into mainheader
Updated styling
Restore StartNewConversation to the old ui style of loki messenger.
Fix friend search display.
Fix header expand animation.
Hooked up menu actions.
Linting.
More styling changes.
Fix tests.
Added back in the loki logo below the gutter.
Fix toast positioning.
Fix context menu showing incorrectly on virtual lists.
Added tabs.
Linting 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								3152f92e30 
								
							
								 
							
						 
						
							
							
								
								Merge signal 1.23.2  
							
							... 
							
							
							
							# Conflicts:
#	app/sql.js
#	js/conversation_controller.js
#	package.json 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								7387e88c97 
								
							
								 
							
						 
						
							
							
								
								Add showing friends in search.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								6ffbc0ac06 
								
							
								 
							
						 
						
							
							
								
								Archive Conversation  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b3ac1373fa 
								
							
								 
							
						 
						
							
							
								
								Move left pane entirely to React  
							
							
							
						 
						
							7 years ago