Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								dc0733968d 
								
									
								
							
								 
							
						 
						
							
							
								
								make moderators and groupAdmins a single name  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								6a776b56f6 
								
									
								
							
								 
							
						 
						
							
							
								
								fix ban of users on open group  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								72c96ea998 
								
									
								
							
								 
							
						 
						
							
							
								
								remove most of the SessionProtocol unused stuff  
							
							 
							
							... 
							
							
							
							- prekeys
- SessionCipher
- LokiCipher
- endSession and the reset Session logic
- what we called Sessionprotocol manager (to keep track of session with
everyone) 
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								979a9058e3 
								
									
								
							
								 
							
						 
						
							
							
								
								remove verified number - related features (partial)  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								6856c0e748 
								
									
								
							
								 
							
						 
						
							
							
								
								remove updateTextInputState not needed and add left to menu tests  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								d43ae09eb0 
								
									
								
							
								 
							
						 
						
							
							
								
								first working version of closed group v2  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								9048913332 
								
									
								
							
								 
							
						 
						
							
							
								
								split conversation reducer for convo logic  
							
							 
							
							... 
							
							
							
							also
- fix ordering of messages for open groups, when they are added
- fix the way the firstMessageOfSeries for just created clsoed groups 
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								2fe6b11e89 
								
									
								
							
								 
							
						 
						
							
							
								
								move ConversationController to typescript  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								c9fd261e0e 
								
									
								
							
								 
							
						 
						
							
							
								
								fix color no opacity for recording playback view  
							
							 
							
							... 
							
							
							
							having an opacity on the bg color was making the source-atop composition not visible with the sweeping color 
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								766a9f9c45 
								
									
								
							
								 
							
						 
						
							
							
								
								fix theme for voice messages and recording  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								788cb2a5fc 
								
							
								 
							
						 
						
							
							
								
								fetch theme for each dialog, as they are out of the themed tree for now  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								e38be266c2 
								
							
								 
							
						 
						
							
							
								
								major rework of session icon => make them styled with styled-component  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								98e7d50b73 
								
									
								
							
								 
							
						 
						
							
							
								
								do not create the convo when fetching avatar.  
							
							 
							
							... 
							
							
							
							if the convo is not here, it's likely it was removed by the user itself. 
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								22b4f39e52 
								
									
								
							
								 
							
						 
						
							
							
								
								MessageDetails: contact status fallbacks to message status  
							
							 
							
							... 
							
							
							
							this is used for medium groups 
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								5c55a9411f 
								
									
								
							
								 
							
						 
						
							
							
								
								add first step to enable back MessageDetails.  
							
							 
							
							... 
							
							
							
							Still not much the react way to do it for now 
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								71e1f1e143 
								
									
								
							
								 
							
						 
						
							
							
								
								ignore ts generated files under subdirectory too  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								a1d4dea845 
								
									
								
							
								 
							
						 
						
							
							
								
								fix scrolling to unread and marking message as read on scrolling  
							
							 
							
							... 
							
							
							
							we need to hit the bottom for the convo to update currently
add smooth scrolling on click on quoted message 
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								d533a3aca5 
								
									
								
							
								 
							
						 
						
							
							
								
								fix unread message banner for MessagesList  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								535b1d59ef 
								
									
								
							
								 
							
						 
						
							
							
								
								add a reset conversation action type and call it on message destroyed  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								bb87eb0f52 
								
									
								
							
								 
							
						 
						
							
							
								
								fix timer expiring sometimes missing a sec  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								1503d83f3a 
								
									
								
							
								 
							
						 
						
							
							
								
								add ourPrimary convo to redux and update the actionPanel with it  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								0beb47e597 
								
									
								
							
								 
							
						 
						
							
							
								
								add messageDeleted redux action  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								2fc61d2c96 
								
									
								
							
								 
							
						 
						
							
							
								
								cleanup expired template from html files  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								f9ab90fb71 
								
									
								
							
								 
							
						 
						
							
							
								
								link backbone message added to redux  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								2f2eb2ad53 
								
									
								
							
								 
							
						 
						
							
							
								
								link back backbone conversation events to redux store  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								918eeae275 
								
									
								
							
								 
							
						 
						
							
							
								
								move InboxView to react  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								2ae7a6dfe5 
								
									
								
							
								 
							
						 
						
							
							
								
								cleanup message.js and conversation_view.js  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								f3430bdcb5 
								
									
								
							
								 
							
						 
						
							
							
								
								add toast on isBlocked, isKicked, ... for sending of messages  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								e45ce43e01 
								
									
								
							
								 
							
						 
						
							
							
								
								store messages currently loaded in convo on redux  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								e613613416 
								
									
								
							
								 
							
						 
						
							
							
								
								show toast with react-toastify and make them a styled-component  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								07c384aa0d 
								
									
								
							
								 
							
						 
						
							
							
								
								render GroupNotification messages  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								96263b4d25 
								
									
								
							
								 
							
						 
						
							
							
								
								WIP  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								ea617cbc57 
								
									
								
							
								 
							
						 
						
							
							
								
								remove stuff related to archived state for convo  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								387f8ff391 
								
									
								
							
								 
							
						 
						
							
							
								
								Update props of SessionConversation to only get the currently selected convo  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								e0fd910fa4 
								
									
								
							
								 
							
						 
						
							
							
								
								move a part of SessionSrollButton to styled component  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								42369cb8f2 
								
									
								
							
								 
							
						 
						
							
							
								
								add redux action to change section of UI  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								026a1930ed 
								
									
								
							
								 
							
						 
						
							
							
								
								add a getOrThrow to ConversationController when we expect this convo  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								b7f5a32570 
								
									
								
							
								 
							
						 
						
							
							
								
								add reply to message UI logic  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								1a379d2466 
								
									
								
							
								 
							
						 
						
							
							
								
								add theme logic to switch between dark/light theme based on redux store  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								d823e2a758 
								
							
								 
							
						 
						
							
							
								
								safety-number-view  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								54b7d9a21b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' of  https://github.com/loki-project/session-desktop  into refactor-ts-react  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								8d544a9d87 
								
									
								
							
								 
							
						 
						
							
							
								
								make redux store update on block/unblock  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								83528f4b8d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' of  https://github.com/loki-project/session-desktop  into refactor-ts-react  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								99674ed2ba 
								
							
								 
							
						 
						
							
							
								
								Fixup PubKey.isEqual  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								4865b72e93 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/clearnet' into receiver-remove-friend-request-logic  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								a83ce4ee16 
								
							
								 
							
						 
						
							
							
								
								Review fixes  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								66de8d9648 
								
									
								
							
								 
							
						 
						
							
							
								
								remove plenty of the friend logic  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								ae44f0da0f 
								
							
								 
							
						 
						
							
							
								
								Remove old multi device functions  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								e6139a5463 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into message-sending-refactor  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								fa853538d0 
								
									
								
							
								 
							
						 
						
							
							
								
								LINT after prettier upgrade  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								60ddaa14be 
								
							
								 
							
						 
						
							
							
								
								Prevent multiple FR conversations  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								7d803280e8 
								
							
								 
							
						 
						
							
							
								
								halfway  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								2b7df8e40b 
								
							
								 
							
						 
						
							
							
								
								Filtering groups fromstate  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								d8a12aab0f 
								
							
								 
							
						 
						
							
							
								
								conv tinkering  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								9a6aafe99c 
								
							
								 
							
						 
						
							
							
								
								Pull from clearnet  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Konstantin Ullrich
							
						 
						
							 
							
							
							
								
							
								20feb23017 
								
							
								 
							
						 
						
							
							
								
								small lint fix in search.ts  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Konstantin Ullrich
							
						 
						
							 
							
							
							
								
							
								366acae1cd 
								
							
								 
							
						 
						
							
							
								
								Minor Fix check if from is invalid not just null  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Konstantin Ullrich
							
						 
						
							 
							
							
							
								
							
								87aee6286d 
								
							
								 
							
						 
						
							
							
								
								Implement requested minor changes  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Konstantin Ullrich
							
						 
						
							 
							
							
							
								
							
								048ca2d405 
								
							
								 
							
						 
						
							
							
								
								fix lint in search.ts  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Konstantin Ullrich
							
						 
						
							 
							
							
							
								
							
								3eca4025e7 
								
							
								 
							
						 
						
							
							
								
								Fix lint in search.ts  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Konstantin Ullrich
							
						 
						
							 
							
							
							
								
							
								f770d4ed44 
								
							
								 
							
						 
						
							
							
								
								lint  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Konstantin Ullrich
							
						 
						
							 
							
							
							
								
							
								8f7083f5a2 
								
							
								 
							
						 
						
							
							
								
								Update Advanced Search by easier date formats  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Konstantin Ullrich
							
						 
						
							 
							
							
							
								
							
								c11a96ad01 
								
							
								 
							
						 
						
							
							
								
								lint  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Konstantin Ullrich
							
						 
						
							 
							
							
							
								
							
								8c32bb93f7 
								
							
								 
							
						 
						
							
							
								
								Implement Advanced Search (from, before and after)  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								7a86a68c22 
								
									
								
							
								 
							
						 
						
							
							
								
								enable back note to self in search result  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								548db7150d 
								
							
								 
							
						 
						
							
							
								
								Start message selection reactification  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								5d11ef1457 
								
							
								 
							
						 
						
							
							
								
								Header props  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								06aeb126c2 
								
									
								
							
								 
							
						 
						
							
							
								
								enable search by username in message view  #928  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								752ee8a614 
								
							
								 
							
						 
						
							
							
								
								Message conditional rendering  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								1689bc617e 
								
							
								 
							
						 
						
							
							
								
								Message loading with redux  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								bb0279983d 
								
							
								 
							
						 
						
							
							
								
								Partially rendered message success and root store manipulation  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								902e678a64 
								
							
								 
							
						 
						
							
							
								
								fix lint  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								4377737642 
								
							
								 
							
						 
						
							
							
								
								fix error with undefined message when searching  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								7cac734ff5 
								
							
								 
							
						 
						
							
							
								
								count globally number of message unread in selector  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								31b98b71be 
								
							
								 
							
						 
						
							
							
								
								enable back search results on messages content  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								73041ccef3 
								
							
								 
							
						 
						
							
							
								
								show receivedFriendRequest in a popup  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								e4b36fe7f7 
								
							
								 
							
						 
						
							
							
								
								add start of user search dropdown in compose view  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								8d6fee4aec 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into multi-device  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								8be1c61f4c 
								
							
								 
							
						 
						
							
							
								
								Highlight conversations with unread mentions of the user  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								d3c3184405 
								
							
								 
							
						 
						
							
							
								
								Search returns primary device when looking up secondary pub key  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								66459ac4bd 
								
							
								 
							
						 
						
							
							
								
								Remove most of the right click and cog menu options for the public chats  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								b5aee4f4be 
								
							
								 
							
						 
						
							
							
								
								Display "Pair New Device" in menu for non-secondary devices  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								662c64f347 
								
							
								 
							
						 
						
							
							
								
								Remove ability to delete some rss conversations  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Tharp
							
						 
						
							 
							
							
							
								
							
								c57571fdfd 
								
							
								 
							
						 
						
							
							
								
								loki.network rss feed  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								7387e88c97 
								
							
								 
							
						 
						
							
							
								
								Add showing friends in search.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								6ffbc0ac06 
								
							
								 
							
						 
						
							
							
								
								Archive Conversation  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								031b64a476 
								
							
								 
							
						 
						
							
							
								
								Disable full-text search until we can go to arbitrary messages  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								b3ac1373fa 
								
							
								 
							
						 
						
							
							
								
								Move left pane entirely to React  
							
							 
							
							
							
						 
						
							7 years ago