Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								360cb52680 
								
									
								
							
								 
							
						 
						
							
							
								
								make all messages types a readable message  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								3f065a7b0e 
								
									
								
							
								 
							
						 
						
							
							
								
								improve marking message as read with hooks  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Warrick Corfe-Tan
							
						 
						
							 
							
							
							
								
							
								31118ae51f 
								
							
								 
							
						 
						
							
							
								
								Add notification icon to conversation list item. Add notification subtitle to conversation header on conversation screen.  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								119b6e1baf 
								
									
								
							
								 
							
						 
						
							
							
								
								keep scrolled position when adding messages at the bottom  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								12d09bc896 
								
									
								
							
								 
							
						 
						
							
							
								
								preload messages when switching conversation  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								f9ecfccc0a 
								
									
								
							
								 
							
						 
						
							
							
								
								batch UI updates of message added events  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								audric
							
						 
						
							 
							
							
							
								
							
								dbf6a0183f 
								
							
								 
							
						 
						
							
							
								
								remove unread top banner on scroll to  bottom  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								audric
							
						 
						
							 
							
							
							
								
							
								bfc4b2b720 
								
							
								 
							
						 
						
							
							
								
								lint  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								audric
							
						 
						
							 
							
							
							
								
							
								588ae85cda 
								
							
								 
							
						 
						
							
							
								
								fix at lat types for attachment  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								audric
							
						 
						
							 
							
							
							
								
							
								12ff3379e1 
								
							
								 
							
						 
						
							
							
								
								add key for all messages list so we can scroll to them programnatically  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								audric
							
						 
						
							 
							
							
							
								
							
								8766cf3f8a 
								
							
								 
							
						 
						
							
							
								
								store offset before refresh of messagesList and restore it  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								audric
							
						 
						
							 
							
							
							
								
							
								c8f0150aaf 
								
							
								 
							
						 
						
							
							
								
								fix unread banner position when first unread is visible  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								audric
							
						 
						
							 
							
							
							
								
							
								c2b5ac68d6 
								
							
								 
							
						 
						
							
							
								
								don't rely on scrollheight to calculate for ui Updates  
							
							 
							
							... 
							
							
							
							as it causes a layout complete refresh 
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								audric
							
						 
						
							 
							
							
							
								
							
								e72885944b 
								
							
								 
							
						 
						
							
							
								
								use selector to sort and add first of serie flag  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								audric
							
						 
						
							 
							
							
							
								
							
								6d34a60f94 
								
							
								 
							
						 
						
							
							
								
								improve performance by not loading all unread messages  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								audric
							
						 
						
							 
							
							
							
								
							
								4f5072ee65 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/clearnet' into perf-improv  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								audric
							
						 
						
							 
							
							
							
								
							
								b7df0788c2 
								
							
								 
							
						 
						
							
							
								
								move mentions state to the ConversationState  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								audric
							
						 
						
							 
							
							
							
								
							
								23e9a6d31c 
								
							
								 
							
						 
						
							
							
								
								move some actions to redux in hooks  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								0e4d7ec21a 
								
									
								
							
								 
							
						 
						
							
							
								
								WIP  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								a54345a42e 
								
									
								
							
								 
							
						 
						
							
							
								
								put back quote a message logic with hook  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								511adcf388 
								
									
								
							
								 
							
						 
						
							
							
								
								refactored right panel to hook  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								4ca5a4f093 
								
									
								
							
								 
							
						 
						
							
							
								
								fixup selected message in redux logic  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								16d34a7137 
								
									
								
							
								 
							
						 
						
							
							
								
								moved conversations reducer to createSlice  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								63b81b4c8e 
								
									
								
							
								 
							
						 
						
							
							
								
								cleanup SessionMessageList p1  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Brice-W
							
						 
						
							 
							
							
							
								
							
								5d7d58fe05 
								
							
								 
							
						 
						
							
							
								
								move NotificationForConvoOption declaration + getConversationNotificationSettingType created as used twice  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Brice-W
							
						 
						
							 
							
							
							
								
							
								adab2b4506 
								
							
								 
							
						 
						
							
							
								
								add Notifications in conversations context menu  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								5b0b165ba9 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/clearnet' into perf-improv  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								f0fad6edfa 
								
									
								
							
								 
							
						 
						
							
							
								
								uniformized props for Message  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								ee4a0b9b1e 
								
									
								
							
								 
							
						 
						
							
							
								
								cleanedup redux action openConversationExternal  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								7f76ab274c 
								
									
								
							
								 
							
						 
						
							
							
								
								added a hook to fetch avatar of closed group members  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Brice-W
							
						 
						
							 
							
							
							
								
							
								5252dd40e3 
								
							
								 
							
						 
						
							
							
								
								fixes  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								4fbb0d48f2 
								
									
								
							
								 
							
						 
						
							
							
								
								remove index as key  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Brice-W
							
						 
						
							 
							
							
							
								
							
								03891a9438 
								
							
								 
							
						 
						
							
							
								
								revert last commit  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Brice-W
							
						 
						
							 
							
							
							
								
							
								21b8b9f35b 
								
							
								 
							
						 
						
							
							
								
								memory optimization  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Brice-W
							
						 
						
							 
							
							
							
								
							
								c3bf2a4e96 
								
							
								 
							
						 
						
							
							
								
								fixes and tests  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								97b9156562 
								
									
								
							
								 
							
						 
						
							
							
								
								improve performamce by memoizing avatar and menus  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Brice-W
							
						 
						
							 
							
							
							
								
							
								75a20e5de7 
								
							
								 
							
						 
						
							
							
								
								simplification by using derived data  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								87a8385629 
								
									
								
							
								 
							
						 
						
							
							
								
								move timerOptions to redux  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								e451cdd78f 
								
									
								
							
								 
							
						 
						
							
							
								
								rename message props to messageProps  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								c8aa73626e 
								
									
								
							
								 
							
						 
						
							
							
								
								do not load right panel data unless it is visibl  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Brice-W
							
						 
						
							 
							
							
							
								
							
								4ddc00c9b6 
								
							
								 
							
						 
						
							
							
								
								set a limit numer to pinned conversations  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								f0db797a9a 
								
									
								
							
								 
							
						 
						
							
							
								
								fix loading of messages props  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								672eb91975 
								
									
								
							
								 
							
						 
						
							
							
								
								add types for message props and remove props function calls msg  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								6deb97dbc0 
								
									
								
							
								 
							
						 
						
							
							
								
								WIP  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								a0afd3efe4 
								
									
								
							
								 
							
						 
						
							
							
								
								add some performance measure for commit calls  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Warrick Corfe-Tan
							
						 
						
							 
							
							
							
								
							
								4decda9cff 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into pin-conversations  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Warrick Corfe-Tan
							
						 
						
							 
							
							
							
								
							
								36cf05db1b 
								
							
								 
							
						 
						
							
							
								
								Switched conversation pin state.  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Warrick Corfe-Tan
							
						 
						
							 
							
							
							
								
							
								08db057ad9 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into pin-conversations  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Warrick Corfe-Tan
							
						 
						
							 
							
							
							
								
							
								49415e3bf0 
								
							
								 
							
						 
						
							
							
								
								Yarn formatting and linting.  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Warrick Corfe-Tan
							
						 
						
							 
							
							
							
								
							
								264f97663e 
								
							
								 
							
						 
						
							
							
								
								Persisting conversation pin statuses.  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								e85f69a144 
								
									
								
							
								 
							
						 
						
							
							
								
								use our retrieve status as isOnline status  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								19555b99a0 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1723  from Bilb/poll-less-often-group-not-active  
							
							 
							
							... 
							
							
							
							Poll less often group not active 
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Warrick Corfe-Tan
							
						 
						
							 
							
							
							
								
							
								6dd7f34e4d 
								
							
								 
							
						 
						
							
							
								
								Pin conversations WIP. Pinning functioning and persisting on conversation list.  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Warrick Corfe-Tan
							
						 
						
							 
							
							
							
								
							
								f2984d0b38 
								
							
								 
							
						 
						
							
							
								
								removed comment.  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								7ea30b70ca 
								
									
								
							
								 
							
						 
						
							
							
								
								variable swarm polling based on activeAt timestamp  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Warrick Corfe-Tan
							
						 
						
							 
							
							
							
								
							
								281b72cca0 
								
							
								 
							
						 
						
							
							
								
								delete unused reducer  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Warrick Corfe-Tan
							
						 
						
							 
							
							
							
								
							
								fc31f8d2b1 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into audio-messages-play-all  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Warrick Corfe-Tan
							
						 
						
							 
							
							
							
								
							
								be11c37a59 
								
							
								 
							
						 
						
							
							
								
								Linting and formatting.  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Warrick Corfe-Tan
							
						 
						
							 
							
							
							
								
							
								da00ac8d44 
								
							
								 
							
						 
						
							
							
								
								Saving userConfig redux slice to local storage.  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								89a0868fc3 
								
									
								
							
								 
							
						 
						
							
							
								
								remove getInstance of conversationController to get()  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Warrick Corfe-Tan
							
						 
						
							 
							
							
							
								
							
								3bd72df258 
								
							
								 
							
						 
						
							
							
								
								linting and formatting.  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Warrick Corfe-Tan
							
						 
						
							 
							
							
							
								
							
								397b0d09dc 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into audio-messages-play-all  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Warrick Corfe-Tan
							
						 
						
							 
							
							
							
								
							
								d35f3f9e62 
								
							
								 
							
						 
						
							
							
								
								WIP: audio autoplay working with consecutive messages. Next step store state on shutdown and rename variables.  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								f1ee7589a0 
								
									
								
							
								 
							
						 
						
							
							
								
								fix session password dialog  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Warrick Corfe-Tan
							
						 
						
							 
							
							
							
								
							
								f381102860 
								
							
								 
							
						 
						
							
							
								
								WIP: autoplay consecutive messages. Setting state done.  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								9a08ab68bc 
								
									
								
							
								 
							
						 
						
							
							
								
								fix onion path status light for orange color  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								b64e8bf610 
								
									
								
							
								 
							
						 
						
							
							
								
								fix seed dialog and leave group as admin dialog  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								651921590c 
								
									
								
							
								 
							
						 
						
							
							
								
								reduxify remaining dialogs  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								93e43fe929 
								
									
								
							
								 
							
						 
						
							
							
								
								move conversation dialogs to redux store  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								bbbcfd54d6 
								
									
								
							
								 
							
						 
						
							
							
								
								rename all spacer-* to react component  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								a5d7995168 
								
									
								
							
								 
							
						 
						
							
							
								
								merge dialog refctor with clearnet  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								c9d7f4a1ab 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'w/onion-paths' into clearnet  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								dd9341a196 
								
									
								
							
								 
							
						 
						
							
							
								
								remove i18n from props everywhere where possible  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								8ef9c8ed1a 
								
									
								
							
								 
							
						 
						
							
							
								
								remove delivery receipt logic  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Warrick Corfe-Tan
							
						 
						
							 
							
							
							
								
							
								ee7afb6ebf 
								
							
								 
							
						 
						
							
							
								
								WIP: refacotring. confirm modals mostly done. Working on add moderator modal now. Need to toggle via setModal.  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Warrick Corfe-Tan
							
						 
						
							 
							
							
							
								
							
								b082dd9f43 
								
							
								 
							
						 
						
							
							
								
								delete messages and leave group working with redux modal.  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Warrick Corfe-Tan
							
						 
						
							 
							
							
							
								
							
								4c8f2bf720 
								
							
								 
							
						 
						
							
							
								
								WIP refactoring confirm dialog to redux state.  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Warrick Corfe-Tan
							
						 
						
							 
							
							
							
								
							
								b2dcb695f8 
								
							
								 
							
						 
						
							
							
								
								Fixed modal header styling for onion path dialog.  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Warrick Corfe-Tan
							
						 
						
							 
							
							
							
								
							
								de3536081a 
								
							
								 
							
						 
						
							
							
								
								onion-paths-WIP  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								f3768a674a 
								
									
								
							
								 
							
						 
						
							
							
								
								short error on no network for retry sending message  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Warrick Corfe-Tan
							
						 
						
							 
							
							
							
								
							
								066e0d954e 
								
							
								 
							
						 
						
							
							
								
								lights glowing but not yet in order.  
							
							 
							
							... 
							
							
							
							WIP glow cycle.
Glow animation working.
Glow animation working, modal no longer interferring with left menu margins.
Cleaning up code. Adding PR suggestions.
Adding typing.
Refactor edit profile modal dialog to no longer use the signal code. 
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								61b04929f0 
								
									
								
							
								 
							
						 
						
							
							
								
								show a spinner while default rooms are loading  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								b055165a5d 
								
									
								
							
								 
							
						 
						
							
							
								
								display a message when the recipient screenshots an attachemnt  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								0192f295f2 
								
									
								
							
								 
							
						 
						
							
							
								
								move the user fetch for mentions to redux  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Warrick Corfe-Tan
							
						 
						
							 
							
							
							
								
							
								98fe0a87d8 
								
							
								 
							
						 
						
							
							
								
								WIP making changes to modal.  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Warrick Corfe-Tan
							
						 
						
							 
							
							
							
								
							
								22a32283b7 
								
							
								 
							
						 
						
							
							
								
								WIP Adding country and styling to modals.  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Warrick Corfe-Tan
							
						 
						
							 
							
							
							
								
							
								d7b22e13e1 
								
							
								 
							
						 
						
							
							
								
								WIP: Onion path modal using redux state and refactored modals.  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								5cab7908b4 
								
									
								
							
								 
							
						 
						
							
							
								
								add some test for partial path rebuilding  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Warrick
							
						 
						
							 
							
							
								
								
							
							
								
							
								cb307790f6 
								
									
								
							
								 
							
						 
						
							
							
								
								WIP: User nicknames ( #1618 )  
							
							 
							
							... 
							
							
							
							* WIP Adding change nickname dialog.
* WIP adding nickname change dialog.
* WIP nickname dialog.
* WIP: Able to set conversation nicknames. Next step cleaning and adding to conversation list menu.
* Fix message capitilisations.
* Add change nickname to conversation list menu.
* Enable clear nickname menu item.
* Added messages for changing nicknames.
* Clearing nicknames working from header and message list.
* Adding modal styling to nickname modal.
* Reorder nickname menu item positions.
* Add group based conditional nickname menu options to conversation header menu.
* minor tidying.
* Remove unused error causing el option.
* Formatting.
* Linting fixes.
* Made PR fixes
* Prioritise displaying nicknames for inviting new closed group members
and updating closed group members. 
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								e41d182972 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix fonts sans serif ( #1619 )  
							
							 
							
							... 
							
							
							
							* force deleteAccount after 10sec timeout waiting for configMessage
* move some constants to file where they are used
* add a way to fetch snodes from snodes
* remove a snode from a pubkey's swarm if we get 421 without valid content
* remove getVersion from snodes
* hide groupMembers in right panel for non-group convo
* fix font sans serif by using roboto instead
Fixes  #1617  
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								1720b6b627 
								
									
								
							
								 
							
						 
						
							
							
								
								store base64 defaut room avatar in redux  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								5289d4c2aa 
								
									
								
							
								 
							
						 
						
							
							
								
								add joinable rooms on opengroupv2 joining screen  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								a26c5da6cb 
								
									
								
							
								 
							
						 
						
							
							
								
								Uniformize once and for all the conversation types  
							
							 
							
							... 
							
							
							
							no more 'direct'. those are private convos 
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								f7581cf4eb 
								
									
								
							
								 
							
						 
						
							
							
								
								increase prettier maxWidth to 100  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								1f509e003d 
								
									
								
							
								 
							
						 
						
							
							
								
								add a markAllAsRead option on menus  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								08ce55f1a6 
								
									
								
							
								 
							
						 
						
							
							
								
								move LeftPane items to hooks  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								51452c5406 
								
									
								
							
								 
							
						 
						
							
							
								
								move settingsleftpane to hooks  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								eb30c7823c 
								
									
								
							
								 
							
						 
						
							
							
								
								add a way to click the toast to turn on microphone to show the settings  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								553f264d12 
								
									
								
							
								 
							
						 
						
							
							
								
								make unread attrs as before a number, and remove calculatingPow  
							
							 
							
							... 
							
							
							
							calculating pow is just the same as sending state 
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								5f862e4c08 
								
									
								
							
								 
							
						 
						
							
							
								
								remove uneeded passing of models to Data calls  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								ad117fe4e5 
								
									
								
							
								 
							
						 
						
							
							
								
								uniformized redux convo type and getProps() of conversation  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								db167eaf1b 
								
							
								 
							
						 
						
							
							
								
								fix a bug preventing our avatar to be updated on restore from seed  
							
							 
							
							... 
							
							
							
							this was due to the fact that the redux was not ready when our
conversation is created. so the events were not linked 
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								8ea9f02cec 
								
							
								 
							
						 
						
							
							
								
								Move data.js to data.ts  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								36fab86d30 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/clearnet' into move-models-to-ts-2  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								f41bf31515 
								
									
								
							
								 
							
						 
						
							
							
								
								fix tests  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								ea2c4437a3 
								
									
								
							
								 
							
						 
						
							
							
								
								cleanup models with unused events  
							
							 
							
							... 
							
							
							
							also, sort message from DB and on redux by sent_at or received_at when
not a public group 
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								5ec9722e00 
								
									
								
							
								 
							
						 
						
							
							
								
								autobind typescript class methods with autobind  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								a51f95d28c 
								
									
								
							
								 
							
						 
						
							
							
								
								move models to TS part1  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								79028ebaeb 
								
									
								
							
								 
							
						 
						
							
							
								
								remove isUnidentifiedDelivery  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								02fb5783a4 
								
									
								
							
								 
							
						 
						
							
							
								
								remove regionCode and PhoneNumber.ts  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								2b92386399 
								
							
								 
							
						 
						
							
							
								
								debounce calls to write to db last message  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								13df6c476e 
								
							
								 
							
						 
						
							
							
								
								remove isClosable for convo as it is unused  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								a0703bc2f9 
								
									
								
							
								 
							
						 
						
							
							
								
								remove primary and secondary device separate status  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								135fc3b366 
								
									
								
							
								 
							
						 
						
							
							
								
								remove prekeys  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								fd18345c5a 
								
									
								
							
								 
							
						 
						
							
							
								
								remove handling of rss related things completely  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								c0484207d1 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into fix-ban-user  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								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
							
						 
						
							 
							
							
								
								
							
							
								
							
								15ae97e0a7 
								
									
								
							
								 
							
						 
						
							
							
								
								use OutgoingMessageStatus in ConversationListItem too  
							
							 
							
							... 
							
							
							
							also, enable back the delivered/read status on message metadata 
							
						 
						
							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
							
						 
						
							 
							
							
								
								
							
							
								
							
								144ae41529 
								
									
								
							
								 
							
						 
						
							
							
								
								add type for ConversationController, remove showStartConversation  
							
							 
							
							... 
							
							
							
							and cleanup scss 
							
						 
						
							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  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								4d991d3992 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into react-refactor  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								b050a3740d 
								
									
								
							
								 
							
						 
						
							
							
								
								clean all updateConversation calls to convo.commit()  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								35ea6af27f 
								
									
								
							
								 
							
						 
						
							
							
								
								Add group avatar as on mobile: with multiple group members avatar  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								70b739d24f 
								
									
								
							
								 
							
						 
						
							
							
								
								update translation to match android - part 1  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								d7de09e475 
								
							
								 
							
						 
						
							
							
								
								linter-fixes  
							
							 
							
							
							
						 
						
							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  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								f03d66de38 
								
									
								
							
								 
							
						 
						
							
							
								
								use active_at to show and sync real contacts from contact list  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								6078be1657 
								
							
								 
							
						 
						
							
							
								
								revive-ts-refactor  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								83528f4b8d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' of  https://github.com/loki-project/session-desktop  into refactor-ts-react  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								4a13b1e6bb 
								
							
								 
							
						 
						
							
							
								
								attemptConnection-complete  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								3a3d412542 
								
							
								 
							
						 
						
							
							
								
								linted  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								3bc7d95d47 
								
							
								 
							
						 
						
							
							
								
								closed-group-contacts-redux  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								e72970fdc7 
								
							
								 
							
						 
						
							
							
								
								load-conv-public  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								5b68ea69f7 
								
							
								 
							
						 
						
							
							
								
								revert activeAt position  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								600653d3d6 
								
							
								 
							
						 
						
							
							
								
								allow cancel linking  
							
							 
							
							
							
						 
						
							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
							
						 
						
							 
							
							
								
								
							
							
								
							
								eb9a838af1 
								
									
								
							
								 
							
						 
						
							
							
								
								remove friends from UI logic  
							
							 
							
							
							
						 
						
							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
							
						 
						
							 
							
							
								
								
							
							
								
							
								e9e5a1508d 
								
									
								
							
								 
							
						 
						
							
							
								
								exclude secondary FR from FR results  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								fa853538d0 
								
									
								
							
								 
							
						 
						
							
							
								
								LINT after prettier upgrade  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								1cd716d053 
								
							
								 
							
						 
						
							
							
								
								Removed comments  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								34ecc5a751 
								
							
								 
							
						 
						
							
							
								
								Finalisation; working FRs from secondary;  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								19cf4fa54b 
								
							
								 
							
						 
						
							
							
								
								Set profile name  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								60ddaa14be 
								
							
								 
							
						 
						
							
							
								
								Prevent multiple FR conversations  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								a668be33d7 
								
							
								 
							
						 
						
							
							
								
								remove lodash  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								ca910be1ef 
								
							
								 
							
						 
						
							
							
								
								removed comments  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								08e223e96e 
								
							
								 
							
						 
						
							
							
								
								final w comments  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								2b0ea5bcc5 
								
							
								 
							
						 
						
							
							
								
								simplificaiton  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								843be3921e 
								
							
								 
							
						 
						
							
							
								
								finalised  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								10ccea5ec8 
								
							
								 
							
						 
						
							
							
								
								tight filtering  
							
							 
							
							
							
						 
						
							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
							
						 
						
							 
							
							
							
								
							
								1d289c04ed 
								
							
								 
							
						 
						
							
							
								
								Message reading instantaneous completed  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								c074234fcc 
								
							
								 
							
						 
						
							
							
								
								Broken redux store  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								f9af58844c 
								
							
								 
							
						 
						
							
							
								
								Broken mapStateToProps  
							
							 
							
							
							
						 
						
							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
							
						 
						
							 
							
							
							
								
							
								ab414ca10e 
								
							
								 
							
						 
						
							
							
								
								Microphone  
							
							 
							
							
							
						 
						
							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
							
						 
						
							 
							
							
							
								
							
								3fec09a293 
								
							
								 
							
						 
						
							
							
								
								Redux prep for refactor  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								cdd19037ba 
								
							
								 
							
						 
						
							
							
								
								Got it working  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								bb0279983d 
								
							
								 
							
						 
						
							
							
								
								Partially rendered message success and root store manipulation  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								c365481aee 
								
							
								 
							
						 
						
							
							
								
								Started boilerplate getSessionConversationInfo  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								a90cae4ac4 
								
							
								 
							
						 
						
							
							
								
								Started boilerplate getSessionConversationInfo  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								bf5badda3b 
								
							
								 
							
						 
						
							
							
								
								Working conversation openning  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								25d0fff95f 
								
							
								 
							
						 
						
							
							
								
								fix build  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								e4a4a333ba 
								
							
								 
							
						 
						
							
							
								
								do not show friends with conversation.activeAt undeifned  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								5797365886 
								
							
								 
							
						 
						
							
							
								
								remove useless !important flag  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								29c7f0ebe4 
								
							
								 
							
						 
						
							
							
								
								userSearchDropdown, display only friends and not all contacts  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								902e678a64 
								
							
								 
							
						 
						
							
							
								
								fix lint  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								2335dbab93 
								
							
								 
							
						 
						
							
							
								
								remove MainHeader class no longer used  
							
							 
							
							
							
						 
						
							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  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								f241440855 
								
							
								 
							
						 
						
							
							
								
								conversation search: do not show user or friends results  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								225f002648 
								
							
								 
							
						 
						
							
							
								
								add conversations with working search on leftpanel  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								685ada5cc5 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into prep-merge  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								006f817faa 
								
							
								 
							
						 
						
							
							
								
								make linter happy  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								c9e3757381 
								
							
								 
							
						 
						
							
							
								
								dial the logging down a notch  
							
							 
							
							
							
						 
						
							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
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								3152f92e30 
								
							
								 
							
						 
						
							
							
								
								Merge signal 1.23.2  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	app/sql.js
#	js/conversation_controller.js
#	package.json 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								7387e88c97 
								
							
								 
							
						 
						
							
							
								
								Add showing friends in search.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								6ffbc0ac06 
								
							
								 
							
						 
						
							
							
								
								Archive Conversation  
							
							 
							
							
							
						 
						
							7 years ago