Vincent
							
						 
						
							 
							
							
							
								
							
								bbf5f8a9f2 
								
							
								 
							
						 
						
							
							
								
								Bottom bar compose message area styling  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								5360968a91 
								
							
								 
							
						 
						
							
							
								
								Add public server modal to message pane  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								9f075125db 
								
							
								 
							
						 
						
							
							
								
								Appview transforms are fixed and in place  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								00f75ee9be 
								
							
								 
							
						 
						
							
							
								
								Messages fix  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								2b7af04587 
								
							
								 
							
						 
						
							
							
								
								Message selection fixed and optimised for speed  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								d20d62e8c6 
								
							
								 
							
						 
						
							
							
								
								Messages display temporary fix and panel optimisations  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								dd421d58f1 
								
							
								 
							
						 
						
							
							
								
								Theme switching. Need to update _session*_light  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								8c9854dd90 
								
							
								 
							
						 
						
							
							
								
								Settings onClick functionality  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								f71dc98fcc 
								
							
								 
							
						 
						
							
							
								
								Setting toggles configured  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								505697bbcd 
								
							
								 
							
						 
						
							
							
								
								App view change working  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								0ee01fc8fd 
								
							
								 
							
						 
						
							
							
								
								Search UI and caret  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								e7d3bc6d35 
								
							
								 
							
						 
						
							
							
								
								Settings view modals and categories  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								589f77a85f 
								
							
								 
							
						 
						
							
							
								
								Completed left panel for settings  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vince
							
						 
						
							 
							
							
								
								
							
							
								
							
								1daf356630 
								
									
								
							
								 
							
						 
						
							
							
								
								Update _session.scss  
							
							 
							
							... 
							
							
							
							Fix brace 
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								74fd0159eb 
								
							
								 
							
						 
						
							
							
								
								Fix conflicts  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								dff4523efa 
								
							
								 
							
						 
						
							
							
								
								Cleanups  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								2d01275ede 
								
							
								 
							
						 
						
							
							
								
								QR Code responds to theme changes  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								2ede557a74 
								
							
								 
							
						 
						
							
							
								
								Modal additions incl. QR fixup and Seed View  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								2caffa9289 
								
							
								 
							
						 
						
							
							
								
								Dependencies resorted and modal adjustments  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								ecaf37cc82 
								
							
								 
							
						 
						
							
							
								
								resolve merge issues  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								634aaa36d4 
								
							
								 
							
						 
						
							
							
								
								update loading screens with session subtitle  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								9f2fe45777 
								
							
								 
							
						 
						
							
							
								
								correct typo css class  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								9cc6807b22 
								
							
								 
							
						 
						
							
							
								
								lint code  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								c9000c3f26 
								
							
								 
							
						 
						
							
							
								
								add the accept/decline buttons on friend requests in conversationslist  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								33fe14c5e0 
								
							
								 
							
						 
						
							
							
								
								revert mistakely removed scss  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								5d6dd5dab0 
								
							
								 
							
						 
						
							
							
								
								filter out conversation friend request in message view  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								7bb0788a3a 
								
							
								 
							
						 
						
							
							
								
								handle send friend request in addcontact page  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								af22bd7b33 
								
							
								 
							
						 
						
							
							
								
								add the leftpane overlay as reusable from subsections  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								571af6c654 
								
							
								 
							
						 
						
							
							
								
								add contact section bottom buttons and empty list  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								c9a35ac89d 
								
							
								 
							
						 
						
							
							
								
								add notification bubble on leftpane header  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								1bbb3cedd4 
								
							
								 
							
						 
						
							
							
								
								render header from static method in LeftPane.tsx to be reused on subsection  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								04227e7fb7 
								
							
								 
							
						 
						
							
							
								
								make the leftpane header a bit more generic to handle tabs  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								7e02536e27 
								
							
								 
							
						 
						
							
							
								
								fix ui on user search view when long list of users  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								f271a24226 
								
							
								 
							
						 
						
							
							
								
								fix displayname searchbox to small on composeview  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								791626c60e 
								
							
								 
							
						 
						
							
							
								
								minor adjustements on userSearchDropdown  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								e4b36fe7f7 
								
							
								 
							
						 
						
							
							
								
								add start of user search dropdown in compose view  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								28a27711e1 
								
							
								 
							
						 
						
							
							
								
								work on compose view  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								98be71680d 
								
							
								 
							
						 
						
							
							
								
								add session h1 h2 and h3  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								e3a0d15890 
								
							
								 
							
						 
						
							
							
								
								add showcompose on showcompose click  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								7c726c8f47 
								
							
								 
							
						 
						
							
							
								
								move the enter session editable to a custom component  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								7ba85921b1 
								
							
								 
							
						 
						
							
							
								
								replace loki with session on loading screens  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								9aa45379a9 
								
							
								 
							
						 
						
							
							
								
								show visually the selected conversation  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								3014b7ccba 
								
							
								 
							
						 
						
							
							
								
								update conversation list item in messages view  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								d9c4e932e9 
								
							
								 
							
						 
						
							
							
								
								animate message background selection changes  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								8d6ae29d87 
								
							
								 
							
						 
						
							
							
								
								conversation list item update unread border and count  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								225f002648 
								
							
								 
							
						 
						
							
							
								
								add conversations with working search on leftpanel  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								c883d20bd7 
								
							
								 
							
						 
						
							
							
								
								add the left pane sections on main page  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								8074756dc2 
								
							
								 
							
						 
						
							
							
								
								Infinte duration toasts  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								66911d6f06 
								
							
								 
							
						 
						
							
							
								
								Connect to server modal semi-complete  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								648cc2339c 
								
							
								 
							
						 
						
							
							
								
								Working with deps  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								659d4412bd 
								
							
								 
							
						 
						
							
							
								
								QR code completion  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								ff7dbd6562 
								
							
								 
							
						 
						
							
							
								
								Globalised consts  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								2419272608 
								
							
								 
							
						 
						
							
							
								
								Updated React dialogs to SessionModals  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								228e4ca81e 
								
							
								 
							
						 
						
							
							
								
								Adding session settings to utilise toggles  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								8aac656107 
								
							
								 
							
						 
						
							
							
								
								Modals finished. Need to xfer all to React  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								9afb8b4d5e 
								
							
								 
							
						 
						
							
							
								
								Major rework of context menus  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								d0d5012e07 
								
							
								 
							
						 
						
							
							
								
								Fixed breaking sessionToggle issues  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								e9d543fe4a 
								
							
								 
							
						 
						
							
							
								
								Dropdown generalisation and simplification  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								12011a30d4 
								
							
								 
							
						 
						
							
							
								
								Inital dropdown, modal and toggle  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								08cc218364 
								
							
								 
							
						 
						
							
							
								
								Fixed orderin of toasts with Maps  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vince
							
						 
						
							 
							
							
								
								
							
							
								
							
								9cd27abf31 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'brand-redesign' into brand-redesign  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								597c177ced 
								
							
								 
							
						 
						
							
							
								
								Syntactical sugar  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								4d463c659c 
								
							
								 
							
						 
						
							
							
								
								Filesize toast amend  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								0d445ab948 
								
							
								 
							
						 
						
							
							
								
								make registration page look closer to design  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								2c80dec146 
								
							
								 
							
						 
						
							
							
								
								add session brand icon on registration page  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								cca4b51c8f 
								
							
								 
							
						 
						
							
							
								
								remove showSubtitle option on registration page  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								2cc7f3ed20 
								
							
								 
							
						 
						
							
							
								
								fix merge issue  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								49d5106b56 
								
							
								 
							
						 
						
							
							
								
								validate form registration on enter press  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								1e7cd24b1b 
								
							
								 
							
						 
						
							
							
								
								session button green borders turns white when hovered  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								f84e286ddc 
								
							
								 
							
						 
						
							
							
								
								update show mnemonic button size  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								1da1da80e9 
								
							
								 
							
						 
						
							
							
								
								add the eye button to show/hide mnemonic  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								47101c85f7 
								
							
								 
							
						 
						
							
							
								
								add signin with mnemonic to sessionRegistration page  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								25127e6c1e 
								
							
								 
							
						 
						
							
							
								
								update font to ne monospaced in sessionID  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								291e3b48a0 
								
							
								 
							
						 
						
							
							
								
								add i18n translation and use them in the app  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								39c8456f8e 
								
							
								 
							
						 
						
							
							
								
								add small animation on the a link of terms and condition  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								82f56f50db 
								
							
								 
							
						 
						
							
							
								
								move back session-icon-button to _session.scss  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								4f889b3c69 
								
							
								 
							
						 
						
							
							
								
								big refactor of scss to include session- prefix everywhere  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								6ac42a824e 
								
							
								 
							
						 
						
							
							
								
								move all the registration page css to another scss file  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								49ed9032ce 
								
							
								 
							
						 
						
							
							
								
								remove .no-select and make most components not-selectable  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								5b61f9a1fc 
								
							
								 
							
						 
						
							
							
								
								add registration tabs and display signin with mnemonic seed  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								6e8eb0aa4d 
								
							
								 
							
						 
						
							
							
								
								fix sessionInput button show/hide visibility  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								55e39a02b3 
								
							
								 
							
						 
						
							
							
								
								Add our custom SessionInput component and use it in the registration page  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								c5dd87bd4f 
								
							
								 
							
						 
						
							
							
								
								add and use wasa font  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								75c35633ab 
								
							
								 
							
						 
						
							
							
								
								add clickhandler to SessionButton and the AccentText component  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Tharp
							
						 
						
							 
							
							
							
								
							
								60b595c5ef 
								
							
								 
							
						 
						
							
							
								
								remove add moderator scroll bars  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								94f6ee3f3b 
								
							
								 
							
						 
						
							
							
								
								Inital toast UI  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								02d23e972c 
								
							
								 
							
						 
						
							
							
								
								Optimisations and SASS simplifcation  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Tharp
							
						 
						
							 
							
							
								
								
							
							
								
							
								2cf39cc1ed 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #690  from neuroscr/multidevice-publicchat  
							
							 
							
							... 
							
							
							
							Add/Remove Moderators interface 
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								0c4f57e57d 
								
							
								 
							
						 
						
							
							
								
								Added session button types and session button colors  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Tharp
							
						 
						
							 
							
							
							
								
							
								5730a88c18 
								
							
								 
							
						 
						
							
							
								
								add/remove moderator modal dialogs  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								98b4b18583 
								
							
								 
							
						 
						
							
							
								
								Added message selection inital functionality and added to buttons  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								4999ececfd 
								
							
								 
							
						 
						
							
							
								
								enlarged avatar when clicked in showUserDetailsDialog  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								c9887f7bc3 
								
							
								 
							
						 
						
							
							
								
								Exports simplification and message selection  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								4d105f5c66 
								
							
								 
							
						 
						
							
							
								
								Simplified icons object  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								141c0135fb 
								
							
								 
							
						 
						
							
							
								
								Fixed styling  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								d62f1c6e22 
								
							
								 
							
						 
						
							
							
								
								Inital conversation restructuring  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								vincentbavitz
							
						 
						
							 
							
							
								
								
							
							
								
							
								5632c3442a 
								
									
								
							
								 
							
						 
						
							
							
								
								Fixed margins on ButtonIcon  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								3a03591e00 
								
							
								 
							
						 
						
							
							
								
								Built generalised Icon component as superclass to IconButton  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								08bf89bdd1 
								
							
								 
							
						 
						
							
							
								
								Updated recommended changes and made simplifications  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								211b9649ec 
								
							
								 
							
						 
						
							
							
								
								Added temporary replacement font  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								533ec4eedc 
								
							
								 
							
						 
						
							
							
								
								Fixed syntax & linted  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								a6fb54233a 
								
							
								 
							
						 
						
							
							
								
								Created generalised icon button component  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								24e24681a6 
								
							
								 
							
						 
						
							
							
								
								add a custom session button  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								be5f932c08 
								
							
								 
							
						 
						
							
							
								
								fix lint  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								bd7f587aa7 
								
							
								 
							
						 
						
							
							
								
								Center avatar and display name in UserDetailsDialog  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								e3a8e5f73c 
								
							
								 
							
						 
						
							
							
								
								UserDetailsDialog: set a separate className  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
								
								
							
							
								
							
								aa35eb61fa 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #659  from msgmaxim/invitations  
							
							 
							
							... 
							
							
							
							Tweak style for group invitations in dark mode 
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
								
								
							
							
								
							
								5a4ea93594 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #653  from Bilb/clearnet  
							
							 
							
							... 
							
							
							
							Fix the conversation horizontal scrollbar when only few conversations #560  
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								60eccd89ae 
								
							
								 
							
						 
						
							
							
								
								Tweak style for group invitations in dark mode  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								c19b53d3fd 
								
							
								 
							
						 
						
							
							
								
								Disable horizontal scrollbar on conversation list  #560  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								07c39523e9 
								
							
								 
							
						 
						
							
							
								
								Show appropriate message in group invitation dialog on no friends  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								a5fce17d8c 
								
							
								 
							
						 
						
							
							
								
								public chat invitations  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
								
								
							
							
								
							
								8cd8c8d4f9 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #610  from msgmaxim/profile-pictures  
							
							 
							
							... 
							
							
							
							Enable custom profile pictures 
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								2990c95e40 
								
							
								 
							
						 
						
							
							
								
								Fix incorrect margins for public messages and friend request bubbles  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								4dd314c18f 
								
							
								 
							
						 
						
							
							
								
								Enable profile pictures  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								685ada5cc5 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into prep-merge  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								8677fb15a0 
								
							
								 
							
						 
						
							
							
								
								Select multiple messages and bulk deletion  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								7c05939f55 
								
							
								 
							
						 
						
							
							
								
								Add group admins and the ability to remove members from private groups  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								0df5214979 
								
							
								 
							
						 
						
							
							
								
								Limit small private groups to 10 members  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								9f81f67460 
								
							
								 
							
						 
						
							
							
								
								Can leave private group chats  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								90f1d4a6aa 
								
							
								 
							
						 
						
							
							
								
								Display error messages when creating/updating group chats  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								cf18572049 
								
							
								 
							
						 
						
							
							
								
								Adding new group members; establishing sessions between non-friends  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								0d19b708f9 
								
							
								 
							
						 
						
							
							
								
								Creating private group chats between friends  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
								
								
							
							
								
							
								6c08852118 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #593  from msgmaxim/not-friends  
							
							 
							
							... 
							
							
							
							Fix incorrectly showing friend request as pending 
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								e64ccbdd2b 
								
							
								 
							
						 
						
							
							
								
								Clean up RSS conversation  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								9e6f6d5a01 
								
							
								 
							
						 
						
							
							
								
								Fix incorrectly showing friend request as pending  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								d97eced37b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into multi-device  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								3bdbf03658 
								
							
								 
							
						 
						
							
							
								
								Enforce display name  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								c477661af0 
								
							
								 
							
						 
						
							
							
								
								Prevent chat member's pubkey from overflowing  
							
							 
							
							
							
						 
						
							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
							
						 
						
							 
							
							
							
								
							
								b63d8ec84f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into multi-device  
							
							 
							
							... 
							
							
							
							* clearnet: (35 commits)
  yarn lint
  return early if signature is not a string
  lint pass 2
  lint pass 1
  make sure versioning on write can't get out of sync
  Update js/modules/loki_public_chat_api.js
  Handle annotations omit correctly
  fix typo CI found
  refactor
  pollOnceForMessages() move lastGot up, address Sacha's review
  Update js/modules/loki_public_chat_api.js
  address review
  address reviews
  Custom message rendering of mentions
  fix method
  separate out new/open, more lint/cleanup
  separate out note to self
  create window.mixpanel here
  use window.mixpanel, remove eventEmitter
  lint and remove unneeded params
  ... 
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								687e9db77b 
								
							
								 
							
						 
						
							
							
								
								Custom message rendering of mentions  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								1496a368e9 
								
							
								 
							
						 
						
							
							
								
								Add UI elements for searching and selecting members in a group chat  
							
							 
							
							
							
						 
						
							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  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								0d9e4bbf45 
								
							
								 
							
						 
						
							
							
								
								Only shorten pubkeys if name is present  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								f860076587 
								
							
								 
							
						 
						
							
							
								
								Modified colour of dark mod badge  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								0b898612d9 
								
							
								 
							
						 
						
							
							
								
								Linting.  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								0883b1b650 
								
							
								 
							
						 
						
							
							
								
								Updated styles.  
							
							 
							
							... 
							
							
							
							Merge commit clearnet into mod-badges 
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								ea5bc24253 
								
							
								 
							
						 
						
							
							
								
								Updated design  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								e9a2b57d37 
								
							
								 
							
						 
						
							
							
								
								Show crown icon for moderators  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								ef6b22f6b9 
								
							
								 
							
						 
						
							
							
								
								Simplify and lint  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Campbell-Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								48b6bf54c1 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #461  from Mikunj/qr-code  
							
							 
							
							... 
							
							
							
							Pubkey QR code 
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Campbell-Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								a6abcaf826 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #453  from Mikunj/profile-simplification  
							
							 
							
							... 
							
							
							
							Profile simplification 
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Campbell-Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								43bd167965 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #463  from loki-project/public-chat  
							
							 
							
							... 
							
							
							
							Public chat 
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								21dad58537 
								
							
								 
							
						 
						
							
							
								
								Linting.  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								3380500a2d 
								
							
								 
							
						 
						
							
							
								
								Added QR code viewing.  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								7b262561a5 
								
							
								 
							
						 
						
							
							
								
								simplify scss for disabled button  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								3a78f47cd7 
								
							
								 
							
						 
						
							
							
								
								Secondary device registration: UX changes (show countdown, disable button, etc.)  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								83d198108c 
								
							
								 
							
						 
						
							
							
								
								Fix the ui bug where items would appear over the loki logo.  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								a7f999aeb1 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #391  from sachaaaaa/show_seed_errors  
							
							 
							
							... 
							
							
							
							Report mnemonic errors instead of silent failure 
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								1f3f63dcc6 
								
							
								 
							
						 
						
							
							
								
								Report mnemonic error in a toast instead of silently fail  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								701f6be00c 
								
							
								 
							
						 
						
							
							
								
								Add missing mnemonic languages  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								1d0067e6e5 
								
							
								 
							
						 
						
							
							
								
								Forgot to add this part  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								d0e73ed7f8 
								
							
								 
							
						 
						
							
							
								
								Add a button to paste pubkey from clipboard if valid  
							
							 
							
							
							
						 
						
							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
							
						 
						
							 
							
							
							
								
							
								61b862b021 
								
							
								 
							
						 
						
							
							
								
								Merge signal 1.24.1  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								8808100796 
								
							
								 
							
						 
						
							
							
								
								Merge signal-1.24.0  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	background.html
#	config/default.json
#	config/production.json
#	js/models/conversations.js
#	js/models/messages.js
#	js/views/conversation_view.js
#	js/views/inbox_view.js
#	js/views/settings_view.js
#	main.js
#	package.json
#	test/index.html
#	ts/components/conversation/ContactName.tsx
#	yarn.lock 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								3a8111020e 
								
							
								 
							
						 
						
							
							
								
								Merge v1.23.0  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	background.html
#	package.json
#	yarn.lock 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								5d916748ae 
								
							
								 
							
						 
						
							
							
								
								Fix styling  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								1f03e04d8c 
								
							
								 
							
						 
						
							
							
								
								Merge commit 'c75a756b2a58bd4a79890e34673d95d9f17f3f01' into signal-1.23  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	js/views/conversation_view.js
#	package.json
#	ts/components/ConversationListItem.tsx
#	ts/components/conversation/ConversationHeader.tsx 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								12ce0140de 
								
							
								 
							
						 
						
							
							
								
								Left pane changes.  
							
							 
							
							... 
							
							
							
							Merge commit 'b3ac1373fa64117fe2a9ccfddf3712f1826c06d9' into signal-1.23
# Conflicts:
#	_locales/en/messages.json
#	background.html
#	js/background.js
#	js/conversation_controller.js
#	js/models/conversations.js
#	js/models/messages.js
#	js/views/conversation_list_item_view.js
#	js/views/conversation_list_view.js
#	js/views/conversation_search_view.js
#	js/views/inbox_view.js
#	libtextsecure/account_manager.js
#	package.json
#	stylesheets/_global.scss
#	stylesheets/_index.scss
#	stylesheets/_modules.scss
#	test/_test.js
#	test/index.html
#	test/models/conversations_test.js
#	test/views/conversation_search_view_test.js
#	ts/components/ConversationListItem.tsx
#	ts/components/MainHeader.tsx
#	ts/components/conversation/ConversationHeader.tsx
#	ts/components/conversation/ResetSessionNotification.tsx 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								e343a04eea 
								
							
								 
							
						 
						
							
							
								
								Merge commit '18b5b7c046436f2defab2e20407e22da180bf97b' into signal-1.22  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	app/sql.js
#	background.html
#	config/default.json
#	js/background.js
#	js/models/conversations.js
#	js/models/messages.js
#	js/modules/data.js
#	js/signal_protocol_store.js
#	js/views/conversation_search_view.js
#	libtextsecure/message_receiver.js
#	libtextsecure/sendmessage.js
#	main.js
#	package.json
#	preload.js
#	test/index.html
#	ts/components/Avatar.tsx
#	ts/components/conversation/ConversationHeader.md
#	ts/components/conversation/ConversationHeader.tsx 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								c7130a3bbb 
								
							
								 
							
						 
						
							
							
								
								Added password confirmation dialog before showing seeds.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								1a211e8df8 
								
							
								 
							
						 
						
							
							
								
								Fix loki image stretching randomly  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								a450cdf528 
								
							
								 
							
						 
						
							
							
								
								Lint fixes for recent PRs  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Opportunity
							
						 
						
							 
							
							
							
								
							
								b2bdb73ce5 
								
							
								 
							
						 
						
							
							
								
								Add font fallback candidates for CJK characters ( #2698 )  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								ae8b3899ad 
								
							
								 
							
						 
						
							
							
								
								Changed registration to be a 2 step process.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								230c6dc284 
								
							
								 
							
						 
						
							
							
								
								Fix vertical sizing of left pane when switching inbox<->archive  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								8c4d90df07 
								
							
								 
							
						 
						
							
							
								
								Send long text as an attachment instead of inline  
							
							 
							
							... 
							
							
							
							Remove Android length warning
Handle incoming long message attachments
Show long download pending status in message bubble
Fix the width of the smallest spinner
Remove Android length warning from HTML templates 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								b3ac1373fa 
								
							
								 
							
						 
						
							
							
								
								Move left pane entirely to React  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								6ffbc0ac06 
								
							
								 
							
						 
						
							
							
								
								Archive Conversation  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								d72f89d776 
								
							
								 
							
						 
						
							
							
								
								Render only visible conversations in left pane  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								9ac76e7e62 
								
							
								 
							
						 
						
							
							
								
								Linting  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								06be1da40d 
								
							
								 
							
						 
						
							
							
								
								Added p2p message styling  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								f5af063191 
								
							
								 
							
						 
						
							
							
								
								Improve spinner colors on top of medium-brightness backgrounds  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								1d2c3ae23c 
								
							
								 
							
						 
						
							
							
								
								Download attachments in separate queue from message processing  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								a43a78731a 
								
							
								 
							
						 
						
							
							
								
								Note to Self  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								c968eb8daf 
								
							
								 
							
						 
						
							
							
								
								revert background colour in main.js (+1 squashed commit)  
							
							 
							
							... 
							
							
							
							Squashed commits:
[9ec61f5f] revert background colour 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								a0f67c22da 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'textsecure/master' into merge_1_21_0  
							
							 
							
							... 
							
							
							
							* textsecure/master: (26 commits)
  v1.21.0
  v1.21.0-beta.4
  Dark Theme: Preserve blue background on app loading screen
  Localization updates
  Fix width of audio player when window is very narrow
  A number of small fixes for Link Previews
  Get rid of the white flash when the app starts up (#3083 )
  v1.21.0-beta.3
  Lint fixes
  Introduce new language: NB
  Fail over to all numbers in retry if errors don't have numbers
  Use the proper method for pulling attachments off disk for retry
  Fix rendering bug with verified state in updateVerified()
  Update electron-builder and electron-updater
  Ensure that dialog pops up when permissions denied for voice note
  Lint fixes
  Large update to localization strings
  Link Previews
  Ensure that blocked messages are dropped even after sealed sender
  Don't linkify quoted message contents
  ...
# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	_locales/cs/messages.json
#	background.html
#	config/default.json
#	index.html
#	js/models/conversations.js
#	js/modules/web_api.js
#	js/settings_start.js
#	js/views/conversation_view.js
#	js/views/settings_view.js
#	package.json
#	protos/SignalService.proto
#	stylesheets/_index.scss
#	stylesheets/_settings.scss 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								1a11c53a79 
								
							
								 
							
						 
						
							
							
								
								Dark Theme: Preserve blue background on app loading screen  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								1d6f1cbcca 
								
							
								 
							
						 
						
							
							
								
								Fix width of audio player when window is very narrow  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Vanja Cosic
							
						 
						
							 
							
							
							
								
							
								b26f6231d8 
								
							
								 
							
						 
						
							
							
								
								Get rid of the white flash when the app starts up ( #3083 )  
							
							 
							
							... 
							
							
							
							* Prevent FOUC on startup, use Signal Blue instead
Instead of flashing a white background on startup, the app will show a blue background while everything is loading.
* Make sure tests are rendered on white background
* Use `icon_250.png` as the loading image
* Remove hardcoded 'Loading...' text from template 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								9b382de6da 
								
							
								 
							
						 
						
							
							
								
								Added online indicator.  
							
							 
							
							... 
							
							
							
							Disable selection in contacts. 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								813924685e 
								
							
								 
							
						 
						
							
							
								
								Link Previews  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								ac59e1249f 
								
							
								 
							
						 
						
							
							
								
								Added db resetting.  
							
							 
							
							... 
							
							
							
							Use built in signal warning view. 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								e544cd4c88 
								
							
								 
							
						 
						
							
							
								
								Added confirmation dialog.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Vanja Cosic
							
						 
						
							 
							
							
							
								
							
								993c85b88c 
								
							
								 
							
						 
						
							
							
								
								Make non-message components of UI non-selectable ( #3078 )  
							
							 
							
							... 
							
							
							
							* Make sidebar non-selectable
* Prevent selection of avatar and context menu text in conversation view
* Make loading view and conversation placeholder view non-selectable
* Make settings view contents non-selectable 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								1a15ec9c15 
								
							
								 
							
						 
						
							
							
								
								Merge commit signal/master into signal-1.20  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								6bd2d3962e 
								
							
								 
							
						 
						
							
							
								
								Linted files  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								0de54e125c 
								
							
								 
							
						 
						
							
							
								
								Improve caption editor usability, new 'add attachment' affordance  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								cba47668cd 
								
							
								 
							
						 
						
							
							
								
								Increase contrast of typing indicator in iOS theme  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								aab2a57b48 
								
							
								 
							
						 
						
							
							
								
								Some style and interaction fine-tuning  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								24455fc8b7 
								
							
								 
							
						 
						
							
							
								
								Updated TTL to use slider.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								2380f01e31 
								
							
								 
							
						 
						
							
							
								
								Ensure that too-wide messages don't overflow in small breakpoint  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								985b1d6aa6 
								
							
								 
							
						 
						
							
							
								
								New staged attachments UI, multiple image attachments per message  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								654b0dac84 
								
							
								 
							
						 
						
							
							
								
								Merge signal-master.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sha-265
							
						 
						
							 
							
							
							
								
							
								3f78a3c466 
								
							
								 
							
						 
						
							
							
								
								Fix text alignment for RTL quoted messages ( #2980 )  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								a1275ab911 
								
							
								 
							
						 
						
							
							
								
								Fix css on linux.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								0491ceacf1 
								
							
								 
							
						 
						
							
							
								
								Added seed dialog.  
							
							 
							
							... 
							
							
							
							Fixed issue where incorrect language was used to generate seed. 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								a1255dd31e 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #77  from Mikunj/password-protection  
							
							 
							
							... 
							
							
							
							Password protection 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								0cfabb5ffa 
								
							
								 
							
						 
						
							
							
								
								Added unread indicator in conversations sections.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								0b87f13699 
								
							
								 
							
						 
						
							
							
								
								Added password dialog view.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								f53bec38a5 
								
							
								 
							
						 
						
							
							
								
								Added password inputs on registration screen.  
							
							 
							
							... 
							
							
							
							Fix case where db is deleted but password hash still remains which causes user to never register.
Allow password to have symbols and other characters.
Added more tests.
Moved passHash from config into the sqlite db.
We can do this because we assume if sql failed to initialise then the key provided was wrong and thus we can show the user the password page. 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								7a96b8446a 
								
							
								 
							
						 
						
							
							
								
								Rename launcherView to passwordView.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								6620244d03 
								
							
								 
							
						 
						
							
							
								
								Show main window on correct password;  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								65015063d2 
								
							
								 
							
						 
						
							
							
								
								Add css styling.  
							
							 
							
							... 
							
							
							
							Added input and button. 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								62c802445b 
								
							
								 
							
						 
						
							
							
								
								Allow generating mnemonic for different languages.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								cea78d1f98 
								
							
								 
							
						 
						
							
							
								
								Updated styling.  
							
							 
							
							... 
							
							
							
							Reworded descriptions and titles. 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								53194e057a 
								
							
								 
							
						 
						
							
							
								
								Added mnemonic warning.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								8c78a78b41 
								
							
								 
							
						 
						
							
							
								
								Converted to dark theme.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								85298012e4 
								
							
								 
							
						 
						
							
							
								
								Added generation of seed in registration.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								89a19fd09b 
								
							
								 
							
						 
						
							
							
								
								Added accordian style to registration view  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								d686783124 
								
							
								 
							
						 
						
							
							
								
								Fix minor icon clipping.  
							
							 
							
							... 
							
							
							
							Disable text highlighting on header. 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								341c5e4ed8 
								
							
								 
							
						 
						
							
							
								
								Updated nickname display modal.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								1cb09cad2a 
								
							
								 
							
						 
						
							
							
								
								Add header options.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								14ecbc3f35 
								
							
								 
							
						 
						
							
							
								
								Moved MainHeader into its own Backbone View.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								a807b6eacd 
								
							
								 
							
						 
						
							
							
								
								Show expand icon on main header.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								cb3599eea8 
								
							
								 
							
						 
						
							
							
								
								Removed IdentityKeyHeader.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								1be63b52b2 
								
							
								 
							
						 
						
							
							
								
								Show contact name on main header.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								06f79eb3fd 
								
							
								 
							
						 
						
							
							
								
								Allow user to set display name when registering.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								961eb53915 
								
							
								 
							
						 
						
							
							
								
								Auto-generate profile images on conversations.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								c32bd3564d 
								
							
								 
							
						 
						
							
							
								
								Fix minor UI layout.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								d6d71cb51e 
								
							
								 
							
						 
						
							
							
								
								Show all contacts.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								3eb193cca2 
								
							
								 
							
						 
						
							
							
								
								Added accordian  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								d1d906cfc0 
								
							
								 
							
						 
						
							
							
								
								Updated conversation textarea styling.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								a530a6c197 
								
							
								 
							
						 
						
							
							
								
								Convert gutter to dark theme.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								62135a1810 
								
							
								 
							
						 
						
							
							
								
								Added a section below conversation list.  
							
							 
							
							... 
							
							
							
							Fixed scrolling on conversations. 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								98c4b5d77b 
								
							
								 
							
						 
						
							
							
								
								Added editing own nickname.  
							
							 
							
							... 
							
							
							
							Fix dark theme support.
Fix notification titles. 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								6ce9d6a08c 
								
							
								 
							
						 
						
							
							
								
								Added nickname dialog.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								f1d18219ed 
								
							
								 
							
						 
						
							
							
								
								Conversation UI update.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								79a861a870 
								
							
								 
							
						 
						
							
							
								
								Typing Indicators  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								99252702e1 
								
							
								 
							
						 
						
							
							
								
								Support receiving multiple images in one messages  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								a9c1f628a4 
								
							
								 
							
						 
						
							
							
								
								Switched to using html select.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								ba390e354b 
								
							
								 
							
						 
						
							
							
								
								Added unblocking.  
							
							 
							
							... 
							
							
							
							Added styling.
Trigger changes on both conversation and messages when we block/unblock. 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								ae2e2fa2ae 
								
							
								 
							
						 
						
							
							
								
								Updated UI in conversation to support user blocking behaviour.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								3789e94342 
								
							
								 
							
						 
						
							
							
								
								Added PoW loading icon.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								a80d6bb868 
								
							
								 
							
						 
						
							
							
								
								Merged branch correctly.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								21f76fa693 
								
							
								 
							
						 
						
							
							
								
								Minor layout fix  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								0a23888875 
								
							
								 
							
						 
						
							
							
								
								Fix up friend request message layout  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								0cf616328e 
								
							
								 
							
						 
						
							
							
								
								Fixed saving prekey bundle once friend request is accepted.  
							
							 
							
							... 
							
							
							
							Added option to delete conversation after it is declined. 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								c150cbe34f 
								
							
								 
							
						 
						
							
							
								
								Friend request message indicator.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								9dc19044b9 
								
							
								 
							
						 
						
							
							
								
								Handle the case where the user is sending a friend request.  
							
							 
							
							... 
							
							
							
							Fix up styling for outgoing message. 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								08ca779fe1 
								
							
								 
							
						 
						
							
							
								
								Fixed up friend request message display  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								f589fdac5c 
								
							
								 
							
						 
						
							
							
								
								Merge signal changes into branch.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								a7d78c0e9b 
								
							
								 
							
						 
						
							
							
								
								Sealed Sender support  
							
							 
							
							... 
							
							
							
							https://signal.org/blog/sealed-sender/  
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								143b1e883d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #17  from sachaaaaa/lock_input_friend_request  
							
							 
							
							... 
							
							
							
							Lock input after friend request is sent 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								9370e2b74a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/signalapp/Signal-Desktop  into development  
							
							 
							
							... 
							
							
							
							* 'master' of https://github.com/signalapp/Signal-Desktop : (38 commits)
  v1.17.0
  v1.17.0-beta.4
  Ensure that blue group avatars are preserved in dark theme
  Android theme: Incoming quotes take color from containing message
  Conversations have blue avatar backgrounds if no image provided
  Fix lint errors
  Add ca language
  inboxView: Ensure Conversation exists for our own number
  Ensure that file is not attached if we've filtered it
  v1.17.0-beta.3
  Localization updates
  v1.16.3
  Lint fixes
  Lint fixes
  Better handle large numbers of messages in cache on startup
  Keep object stores after conversations migrate to SQLCipher
  Longer timeout for orphaned file cleanup
  Tests and increase consistency for isFileDangerous calls
  Longer timeout for orphaned file cleanup
  v1.17.0-beta.2
  ...
# Conflicts:
#	background.html
#	package.json 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								2b5f6d8b5e 
								
							
								 
							
						 
						
							
							
								
								Ensure that blue group avatars are preserved in dark theme  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								f21f83a163 
								
							
								 
							
						 
						
							
							
								
								Conversations have blue avatar backgrounds if no image provided  
							
							 
							
							
							
						 
						
							7 years ago