15ae97e0a7 
								
									
								
							
								 
							
						 
						
							
							
								
								use OutgoingMessageStatus in ConversationListItem too  
							
							... 
							
							
							
							also, enable back the delivered/read status on message metadata 
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								1503d83f3a 
								
									
								
							
								 
							
						 
						
							
							
								
								add ourPrimary convo to redux and update the actionPanel with it  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								2f2eb2ad53 
								
									
								
							
								 
							
						 
						
							
							
								
								link back backbone conversation events to redux store  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								ea617cbc57 
								
									
								
							
								 
							
						 
						
							
							
								
								remove stuff related to archived state for convo  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								144ae41529 
								
									
								
							
								 
							
						 
						
							
							
								
								add type for ConversationController, remove showStartConversation  
							
							... 
							
							
							
							and cleanup scss 
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								4d991d3992 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into react-refactor  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								b050a3740d 
								
									
								
							
								 
							
						 
						
							
							
								
								clean all updateConversation calls to convo.commit()  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								35ea6af27f 
								
									
								
							
								 
							
						 
						
							
							
								
								Add group avatar as on mobile: with multiple group members avatar  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								70b739d24f 
								
									
								
							
								 
							
						 
						
							
							
								
								update translation to match android - part 1  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								d7de09e475 
								
							
								 
							
						 
						
							
							
								
								linter-fixes  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								54b7d9a21b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' of  https://github.com/loki-project/session-desktop  into refactor-ts-react  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								8d544a9d87 
								
									
								
							
								 
							
						 
						
							
							
								
								make redux store update on block/unblock  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								f03d66de38 
								
									
								
							
								 
							
						 
						
							
							
								
								use active_at to show and sync real contacts from contact list  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								83528f4b8d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' of  https://github.com/loki-project/session-desktop  into refactor-ts-react  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								4a13b1e6bb 
								
							
								 
							
						 
						
							
							
								
								attemptConnection-complete  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								3a3d412542 
								
							
								 
							
						 
						
							
							
								
								linted  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								3bc7d95d47 
								
							
								 
							
						 
						
							
							
								
								closed-group-contacts-redux  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								e72970fdc7 
								
							
								 
							
						 
						
							
							
								
								load-conv-public  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								5b68ea69f7 
								
							
								 
							
						 
						
							
							
								
								revert activeAt position  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								600653d3d6 
								
							
								 
							
						 
						
							
							
								
								allow cancel linking  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								eb9a838af1 
								
									
								
							
								 
							
						 
						
							
							
								
								remove friends from UI logic  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								66de8d9648 
								
									
								
							
								 
							
						 
						
							
							
								
								remove plenty of the friend logic  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								5d11ef1457 
								
							
								 
							
						 
						
							
							
								
								Header props  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								bb0279983d 
								
							
								 
							
						 
						
							
							
								
								Partially rendered message success and root store manipulation  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								c365481aee 
								
							
								 
							
						 
						
							
							
								
								Started boilerplate getSessionConversationInfo  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a90cae4ac4 
								
							
								 
							
						 
						
							
							
								
								Started boilerplate getSessionConversationInfo  
							
							
							
						 
						
							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