404a2129af 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #700  from neuroscr/multidevice-publicchat  
							
							... 
							
							
							
							Defeat caching of context menu 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								4d463c659c 
								
							
								 
							
						 
						
							
							
								
								Filesize toast amend  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5a6960b481 
								
							
								 
							
						 
						
							
							
								
								Completed toast stacking, fadeout and close.  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								dcc3232b2b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #697  from msgmaxim/mentions-fix  
							
							... 
							
							
							
							Fix not awaiting on promises in mentions 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2c80dec146 
								
							
								 
							
						 
						
							
							
								
								add session brand icon on registration page  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								7507b9c2ce 
								
							
								 
							
						 
						
							
							
								
								defeat caching of context menu, and remove unneeded parameter to getHeaderProps  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								cca4b51c8f 
								
							
								 
							
						 
						
							
							
								
								remove showSubtitle option on registration page  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2cc7f3ed20 
								
							
								 
							
						 
						
							
							
								
								fix merge issue  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								db12bf0f3e 
								
							
								 
							
						 
						
							
							
								
								ugly hack to empty contenteditable div  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								49d5106b56 
								
							
								 
							
						 
						
							
							
								
								validate form registration on enter press  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e3360b1978 
								
							
								 
							
						 
						
							
							
								
								hide registration subtitle and fix enableShowHide in SessionInput  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e17e93ef84 
								
							
								 
							
						 
						
							
							
								
								remove props 118n in our code and call it from the window global  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								ccd037201b 
								
							
								 
							
						 
						
							
							
								
								remove unused sessionIconButton class under /session  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								b1406ed391 
								
							
								 
							
						 
						
							
							
								
								lint and remove unused code  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								4ad62284fa 
								
							
								 
							
						 
						
							
							
								
								add an animation when showing the sessionID on registration  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5039930508 
								
							
								 
							
						 
						
							
							
								
								add basic secondary device link to new registration page  
							
							... 
							
							
							
							needs to handle errors and popup to show secret words, ... 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								818cfc6dd3 
								
							
								 
							
						 
						
							
							
								
								make display name mandatory (remove optional string)  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5e67c28132 
								
							
								 
							
						 
						
							
							
								
								remove useless TabSelectEvent interface  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								803b24ef16 
								
							
								 
							
						 
						
							
							
								
								fix lint  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8d11553fe5 
								
							
								 
							
						 
						
							
							
								
								add a *ignore* method to Promise to make tslint happy  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d5b8436f4d 
								
							
								 
							
						 
						
							
							
								
								integrate dangerouslySetInnerHTML into custom components and sanityze it before rendering  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f84e286ddc 
								
							
								 
							
						 
						
							
							
								
								update show mnemonic button size  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0bb92971ee 
								
							
								 
							
						 
						
							
							
								
								SessionButtonTypes -> SessionButtonType and create enum for registration tabs  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								295e707101 
								
							
								 
							
						 
						
							
							
								
								move ts session globals to global.d.ts  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								1da1da80e9 
								
							
								 
							
						 
						
							
							
								
								add the eye button to show/hide mnemonic  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								47101c85f7 
								
							
								 
							
						 
						
							
							
								
								add signin with mnemonic to sessionRegistration page  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e2519c38e1 
								
							
								 
							
						 
						
							
							
								
								fix lint  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d6913c4819 
								
							
								 
							
						 
						
							
							
								
								do not localize registration strings which cannot be easily made  
							
							... 
							
							
							
							begin your session
ensuring peace of mind
and terms and conditions
are all static english code because otherwise we would need to use
dangerouslySetHtml 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								291e3b48a0 
								
							
								 
							
						 
						
							
							
								
								add i18n translation and use them in the app  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2f8820a27b 
								
							
								 
							
						 
						
							
							
								
								rename floatField to session-input-floating-label in SessionInput  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								4f889b3c69 
								
							
								 
							
						 
						
							
							
								
								big refactor of scss to include session- prefix everywhere  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								49ed9032ce 
								
							
								 
							
						 
						
							
							
								
								remove .no-select and make most components not-selectable  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								73a07f74f9 
								
							
								 
							
						 
						
							
							
								
								complete registration signup tab UI  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e948684a83 
								
							
								 
							
						 
						
							
							
								
								add the basic of the create account tab and yarn lint  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5b61f9a1fc 
								
							
								 
							
						 
						
							
							
								
								add registration tabs and display signin with mnemonic seed  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								6e8eb0aa4d 
								
							
								 
							
						 
						
							
							
								
								fix sessionInput button show/hide visibility  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								55e39a02b3 
								
							
								 
							
						 
						
							
							
								
								Add our custom SessionInput component and use it in the registration page  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2813e92ad2 
								
							
								 
							
						 
						
							
							
								
								update enum types to be capitalized  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								c5dd87bd4f 
								
							
								 
							
						 
						
							
							
								
								add and use wasa font  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								30c31260ac 
								
							
								 
							
						 
						
							
							
								
								fixlint  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								cc97d9284b 
								
							
								 
							
						 
						
							
							
								
								add first chunck of our SessionRegistrationView  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								75c35633ab 
								
							
								 
							
						 
						
							
							
								
								add clickhandler to SessionButton and the AccentText component  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								472d5ed3be 
								
							
								 
							
						 
						
							
							
								
								correct menu for RSS conversations  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								efc03153d3 
								
							
								 
							
						 
						
							
							
								
								Fix not awaiting on promises in mentions  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								94f6ee3f3b 
								
							
								 
							
						 
						
							
							
								
								Inital toast UI  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								26ea0d3ce4 
								
							
								 
							
						 
						
							
							
								
								take out unneeded dollar signs  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								02d23e972c 
								
							
								 
							
						 
						
							
							
								
								Optimisations and SASS simplifcation  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2bdc0579c3 
								
							
								 
							
						 
						
							
							
								
								Message deletion moderator check and toast.  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2cf39cc1ed 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #690  from neuroscr/multidevice-publicchat  
							
							... 
							
							
							
							Add/Remove Moderators interface 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2761e89732 
								
							
								 
							
						 
						
							
							
								
								Make aspects of the HTML easier to style  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0281338a39 
								
							
								 
							
						 
						
							
							
								
								fix tabIndex  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								fc235d6057 
								
							
								 
							
						 
						
							
							
								
								Completed message selection  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0c4f57e57d 
								
							
								 
							
						 
						
							
							
								
								Added session button types and session button colors  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9af91d228c 
								
							
								 
							
						 
						
							
							
								
								fix typo  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5730a88c18 
								
							
								 
							
						 
						
							
							
								
								add/remove moderator modal dialogs  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								98b4b18583 
								
							
								 
							
						 
						
							
							
								
								Added message selection inital functionality and added to buttons  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								6d662f6b05 
								
							
								 
							
						 
						
							
							
								
								rename UserDetailsDialog isEnlargeImageShown-> isEnlargedImageShown  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a30d772c64 
								
							
								 
							
						 
						
							
							
								
								topleft avatar click show edit profile  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								531b782669 
								
							
								 
							
						 
						
							
							
								
								click on our avatar show the edit profile dialog & fix lint  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								14dab92989 
								
							
								 
							
						 
						
							
							
								
								jazzicon make borderRadius 50% rather than 50px  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2fdb4c3540 
								
							
								 
							
						 
						
							
							
								
								cleanup code  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								4999ececfd 
								
							
								 
							
						 
						
							
							
								
								enlarged avatar when clicked in showUserDetailsDialog  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								b21b439092 
								
							
								 
							
						 
						
							
							
								
								make showUserDetails modal close on click outside  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								c2c084920a 
								
							
								 
							
						 
						
							
							
								
								Namespacing  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								c9887f7bc3 
								
							
								 
							
						 
						
							
							
								
								Exports simplification and message selection  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								10676f5573 
								
							
								 
							
						 
						
							
							
								
								Improved file structuring  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								4d105f5c66 
								
							
								 
							
						 
						
							
							
								
								Simplified icons object  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a17964beb7 
								
							
								 
							
						 
						
							
							
								
								Using singular enum names rather than plural  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								19f8e85786 
								
							
								 
							
						 
						
							
							
								
								Prop destructuring  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								35e85dc2bc 
								
							
								 
							
						 
						
							
							
								
								Merged  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								141c0135fb 
								
							
								 
							
						 
						
							
							
								
								Fixed styling  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d62f1c6e22 
								
							
								 
							
						 
						
							
							
								
								Inital conversation restructuring  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								37f4b8e8ed 
								
							
								 
							
						 
						
							
							
								
								use else  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								64d4a7e28f 
								
									
								
							
								 
							
						 
						
							
							
								
								Made IconButton purely compositional for generalisability  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d3e6494c36 
								
									
								
							
								 
							
						 
						
							
							
								
								iconRotation not necessary as class.  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								11915614b5 
								
									
								
							
								 
							
						 
						
							
							
								
								Update SessionIcon.tsx  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								fa8f310b02 
								
							
								 
							
						 
						
							
							
								
								Switched IconButton to fully compositional format for generalisation  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								20f379e0c2 
								
									
								
							
								 
							
						 
						
							
							
								
								Removed redundant artifact  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3a03591e00 
								
							
								 
							
						 
						
							
							
								
								Built generalised Icon component as superclass to IconButton  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d866e0ca2d 
								
							
								 
							
						 
						
							
							
								
								Updated recommended changes and made simplifications  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								08bf89bdd1 
								
							
								 
							
						 
						
							
							
								
								Updated recommended changes and made simplifications  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f7fde304ab 
								
							
								 
							
						 
						
							
							
								
								Fixed syntax & linted  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								533ec4eedc 
								
							
								 
							
						 
						
							
							
								
								Fixed syntax & linted  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a6fb54233a 
								
							
								 
							
						 
						
							
							
								
								Created generalised icon button component  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								24e24681a6 
								
							
								 
							
						 
						
							
							
								
								add a custom session button  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d58a835af4 
								
							
								 
							
						 
						
							
							
								
								enable updateGroup if a public chat channel mod  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								b152d186d5 
								
							
								 
							
						 
						
							
							
								
								handle public chat group update  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a3abf3b14a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #661  from sachaaaaa/encrypted_avatar  
							
							... 
							
							
							
							Encrypted profile pic 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								25f0c3f700 
								
							
								 
							
						 
						
							
							
								
								Hide 'edit profile' on secondary devices  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								44ff75cc88 
								
							
								 
							
						 
						
							
							
								
								Fixed multi select by preventing select on clicking audio element in message list.  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								1020f54b60 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #662  from Bilb/655-clickable-profile  
							
							... 
							
							
							
							clickable profile 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2e83881373 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #652  from vincentbavitz/public-ban  
							
							... 
							
							
							
							Public ban 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a7a2f9289c 
								
							
								 
							
						 
						
							
							
								
								Updated references to hasModPerms to isModerator for code consistency  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								061556bb7d 
								
							
								 
							
						 
						
							
							
								
								trigger showUserDetails on message's avatar clicks  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e9068d56ce 
								
							
								 
							
						 
						
							
							
								
								Updated isModerator to senderIsModerator and fixed logic of isModerator function  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								acea116d4f 
								
							
								 
							
						 
						
							
							
								
								Revert "Message: click on avatar show userDetailModal"  
							
							... 
							
							
							
							This reverts commit 2c914c554d 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								be5f932c08 
								
							
								 
							
						 
						
							
							
								
								fix lint  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								bd7f587aa7 
								
							
								 
							
						 
						
							
							
								
								Center avatar and display name in UserDetailsDialog  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								c61249e5e0 
								
							
								 
							
						 
						
							
							
								
								put event in the avatar element and trigger it in conversation header  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2c914c554d 
								
							
								 
							
						 
						
							
							
								
								Message: click on avatar show userDetailModal  
							
							... 
							
							
							
							Disable the click on avatar because before it selected the message.
OnClick on avatar -> trigger event to show the UserDetails modal with this pubkey. 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9992a3da1d 
								
							
								 
							
						 
						
							
							
								
								Add a showUserDetails modal to display user's details  
							
							... 
							
							
							
							Relates #655  
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5a4ea93594 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #653  from Bilb/clearnet  
							
							... 
							
							
							
							Fix the conversation horizontal scrollbar when only few conversations #560  
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2c789c8b0e 
								
							
								 
							
						 
						
							
							
								
								fix lint  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0b15fa467b 
								
							
								 
							
						 
						
							
							
								
								Fix the conversation scrollbar when only few conversations  #560  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								07c39523e9 
								
							
								 
							
						 
						
							
							
								
								Show appropriate message in group invitation dialog on no friends  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								43a91ab672 
								
							
								 
							
						 
						
							
							
								
								Linted  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2ab0d084f1 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #645  from msgmaxim/group-invites  
							
							... 
							
							
							
							Public chat invitations 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a3d171884d 
								
							
								 
							
						 
						
							
							
								
								Added ban user right click functionality  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								6cde9aa263 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #638  from neuroscr/multidevice-publicchat  
							
							... 
							
							
							
							Public Chat - home server refactor / read public chat avatars from home server 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								89e5e919f2 
								
							
								 
							
						 
						
							
							
								
								Address more review comments  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a5fce17d8c 
								
							
								 
							
						 
						
							
							
								
								public chat invitations  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9d50c21b29 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #635  from msgmaxim/context-menu-select  
							
							... 
							
							
							
							Don't select messages when context menu is shown 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f245007a8b 
								
							
								 
							
						 
						
							
							
								
								convert findMember to async  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8cd8c8d4f9 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #610  from msgmaxim/profile-pictures  
							
							... 
							
							
							
							Enable custom profile pictures 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e738e07d3e 
								
							
								 
							
						 
						
							
							
								
								Add missing margin to typing indicator bubbles  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8b2876dadc 
								
							
								 
							
						 
						
							
							
								
								Disable context menu and message selection for RSS feed  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2262b41cd7 
								
							
								 
							
						 
						
							
							
								
								Prevent hiding the context menu by clicking away to also potentially select messages  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2990c95e40 
								
							
								 
							
						 
						
							
							
								
								Fix incorrect margins for public messages and friend request bubbles  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								4dd314c18f 
								
							
								 
							
						 
						
							
							
								
								Enable profile pictures  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								685ada5cc5 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into prep-merge  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								ffd1667964 
								
							
								 
							
						 
						
							
							
								
								mainheader: call setstate only when needed for clipboard  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								006f817faa 
								
							
								 
							
						 
						
							
							
								
								make linter happy  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								c9e3757381 
								
							
								 
							
						 
						
							
							
								
								dial the logging down a notch  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								7c96990119 
								
							
								 
							
						 
						
							
							
								
								Correctly handle server errors in multi-deletion  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8677fb15a0 
								
							
								 
							
						 
						
							
							
								
								Select multiple messages and bulk deletion  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f4ed8b2bf3 
								
							
								 
							
						 
						
							
							
								
								Add a feature flag for private group chats  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								395daf3aba 
								
							
								 
							
						 
						
							
							
								
								Use Array.includes in place of Array.indexOf  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a2f836c690 
								
							
								 
							
						 
						
							
							
								
								Address review comments  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								7c05939f55 
								
							
								 
							
						 
						
							
							
								
								Add group admins and the ability to remove members from private groups  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0df5214979 
								
							
								 
							
						 
						
							
							
								
								Limit small private groups to 10 members  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0490e5c668 
								
							
								 
							
						 
						
							
							
								
								Clean up conversation options for groups  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9f81f67460 
								
							
								 
							
						 
						
							
							
								
								Can leave private group chats  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f5e9a870f7 
								
							
								 
							
						 
						
							
							
								
								Add support for mentions in private group chats  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								90f1d4a6aa 
								
							
								 
							
						 
						
							
							
								
								Display error messages when creating/updating group chats  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								cf18572049 
								
							
								 
							
						 
						
							
							
								
								Adding new group members; establishing sessions between non-friends  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0d19b708f9 
								
							
								 
							
						 
						
							
							
								
								Creating private group chats between friends  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								6c08852118 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #593  from msgmaxim/not-friends  
							
							... 
							
							
							
							Fix incorrectly showing friend request as pending 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								65361d33f5 
								
							
								 
							
						 
						
							
							
								
								New menu item "show pairing words" for secondary devices  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e64ccbdd2b 
								
							
								 
							
						 
						
							
							
								
								Clean up RSS conversation  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9e6f6d5a01 
								
							
								 
							
						 
						
							
							
								
								Fix incorrectly showing friend request as pending  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								08ad913105 
								
							
								 
							
						 
						
							
							
								
								Add explicit isSecondary flag to conversation list items so they can remain hidden in the menu after they become friends etc  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d97eced37b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into multi-device  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5d2f7ddb20 
								
							
								 
							
						 
						
							
							
								
								Add messages needed for UI, bit of house work  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								39fac5fd02 
								
							
								 
							
						 
						
							
							
								
								Add initial add server UI skeleton  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8d6fee4aec 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into multi-device  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8be1c61f4c 
								
							
								 
							
						 
						
							
							
								
								Highlight conversations with unread mentions of the user  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								b13a4f3e56 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #520  from msgmaxim/mentions2  
							
							... 
							
							
							
							Custom message rendering of mentions 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								16692696e0 
								
							
								 
							
						 
						
							
							
								
								address reviews  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								155a3b8f17 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #512  from neuroscr/desktop-analytics  
							
							... 
							
							
							
							Desktop Analytics 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								687e9db77b 
								
							
								 
							
						 
						
							
							
								
								Custom message rendering of mentions  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								1496a368e9 
								
							
								 
							
						 
						
							
							
								
								Add UI elements for searching and selecting members in a group chat  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								88b44390bf 
								
							
								 
							
						 
						
							
							
								
								Desktop Analytics  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8ecf057386 
								
							
								 
							
						 
						
							
							
								
								Display list of paired device in modal  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								0d9e4bbf45 
								
							
								 
							
						 
						
							
							
								
								Only shorten pubkeys if name is present  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								08cab426c5 
								
							
								 
							
						 
						
							
							
								
								Shorten pubkeys in quotations too  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d3c3184405 
								
							
								 
							
						 
						
							
							
								
								Search returns primary device when looking up secondary pub key  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0b898612d9 
								
							
								 
							
						 
						
							
							
								
								Linting.  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0883b1b650 
								
							
								 
							
						 
						
							
							
								
								Updated styles.  
							
							... 
							
							
							
							Merge commit clearnet into mod-badges 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								c48ae80468 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #486  from Mikunj/profile-icons  
							
							... 
							
							
							
							Profile icons 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e9a2b57d37 
								
							
								 
							
						 
						
							
							
								
								Show crown icon for moderators  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								72b3d02b52 
								
							
								 
							
						 
						
							
							
								
								Poll for moderators, store them on the conversation and use the list to determine our own mod status  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								700c835782 
								
							
								 
							
						 
						
							
							
								
								Update ts/components/conversation/FriendRequest.md  
							
							... 
							
							
							
							Co-Authored-By: Mikunj Varsani <Mikunj@users.noreply.github.com> 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e5eab74b1b 
								
							
								 
							
						 
						
							
							
								
								Fix   #355  Display timestamp for friend requests  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5dc52f0858 
								
							
								 
							
						 
						
							
							
								
								Fix incorrect hue shifting  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								aa216d7a5d 
								
							
								 
							
						 
						
							
							
								
								Added minor comment.  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a9189979e1 
								
							
								 
							
						 
						
							
							
								
								Added JazzIcon  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5247bc56b7 
								
							
								 
							
						 
						
							
							
								
								Address review  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								870dc7f904 
								
							
								 
							
						 
						
							
							
								
								Fix tests, refactor menu items to please linter and lint  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								66459ac4bd 
								
							
								 
							
						 
						
							
							
								
								Remove most of the right click and cog menu options for the public chats  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a2cda31f1a 
								
							
								 
							
						 
						
							
							
								
								Remove delete option from more info  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								48b6bf54c1 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #461  from Mikunj/qr-code  
							
							... 
							
							
							
							Pubkey QR code 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3c6b374428 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #424  from Mikunj/timestamp-fix  
							
							... 
							
							
							
							Don't show relative timestamp. 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								21dad58537 
								
							
								 
							
						 
						
							
							
								
								Linting.  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3380500a2d 
								
							
								 
							
						 
						
							
							
								
								Added QR code viewing.  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								616e952f8e 
								
							
								 
							
						 
						
							
							
								
								Add right click option to public chat messages to copy pubkey of sender  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f4e76f0576 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #455  from neuroscr/public-delete  
							
							... 
							
							
							
							Public delete 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								ba72f55b03 
								
							
								 
							
						 
						
							
							
								
								Fix missing react key error  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								351fa09ad6 
								
							
								 
							
						 
						
							
							
								
								Only show delete option if have mod status and show different modal for mod deletion  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e4ecc5b389 
								
							
								 
							
						 
						
							
							
								
								A prepare for message deletion  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								59e1bb48c1 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #434  from sachaaaaa/fix_clipboard_redraws  
							
							... 
							
							
							
							[multi-device] Fix main header being redrawn every 100ms 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								4a35492fe0 
								
							
								 
							
						 
						
							
							
								
								Fix main header being redrawn every 100ms  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								b5aee4f4be 
								
							
								 
							
						 
						
							
							
								
								Display "Pair New Device" in menu for non-secondary devices  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								662c64f347 
								
							
								 
							
						 
						
							
							
								
								Remove ability to delete some rss conversations  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9bd6b7a364 
								
							
								 
							
						 
						
							
							
								
								lint  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a0e7ba252c 
								
							
								 
							
						 
						
							
							
								
								strip style and improving stripping regex  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								c57571fdfd 
								
							
								 
							
						 
						
							
							
								
								loki.network rss feed  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								92c3e19865 
								
							
								 
							
						 
						
							
							
								
								Don't show relative timestamp.  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								fce4d0ce79 
								
							
								 
							
						 
						
							
							
								
								Review cleanup  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								86e55e5dc6 
								
							
								 
							
						 
						
							
							
								
								Clean up bold check  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3ea3a394e7 
								
							
								 
							
						 
						
							
							
								
								Only bold the profile name for messages  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								958766dc65 
								
							
								 
							
						 
						
							
							
								
								Bold the profile name and truncate the pubkey  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3a5e6e2fd3 
								
							
								 
							
						 
						
							
							
								
								Lint  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								1fc2173d9b 
								
							
								 
							
						 
						
							
							
								
								Update header template to display group names properly and update migration to only store name for public chat  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								1d0067e6e5 
								
							
								 
							
						 
						
							
							
								
								Forgot to add this part  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d0e73ed7f8 
								
							
								 
							
						 
						
							
							
								
								Add a button to paste pubkey from clipboard if valid  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								47ac247f83 
								
							
								 
							
						 
						
							
							
								
								Comment out the show all media button  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a8a959b326 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'development' into signal-1.24  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b8ef6c2cc6 
								
							
								 
							
						 
						
							
							
								
								Loki changes  
							
							... 
							
							
							
							Added friends section in search.
This is because contacts is now used in signal for something else and we don't want to clash meanings.
Styling fixes
Add dropdown options into mainheader
Updated styling
Restore StartNewConversation to the old ui style of loki messenger.
Fix friend search display.
Fix header expand animation.
Hooked up menu actions.
Linting.
More styling changes.
Fix tests.
Added back in the loki logo below the gutter.
Fix toast positioning.
Fix context menu showing incorrectly on virtual lists.
Added tabs.
Linting 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ce4105f529 
								
							
								 
							
						 
						
							
							
								
								Fix node tests  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								61b862b021 
								
							
								 
							
						 
						
							
							
								
								Merge signal 1.24.1  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								3152f92e30 
								
							
								 
							
						 
						
							
							
								
								Merge signal 1.23.2  
							
							... 
							
							
							
							# Conflicts:
#	app/sql.js
#	js/conversation_controller.js
#	package.json 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								42c501e7f8 
								
							
								 
							
						 
						
							
							
								
								Merge v1.23.1  
							
							... 
							
							
							
							# Conflicts:
#	package.json 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								3a8111020e 
								
							
								 
							
						 
						
							
							
								
								Merge v1.23.0  
							
							... 
							
							
							
							# Conflicts:
#	background.html
#	package.json
#	yarn.lock 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								7387e88c97 
								
							
								 
							
						 
						
							
							
								
								Add showing friends in search.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								fca40cb548 
								
							
								 
							
						 
						
							
							
								
								Disable keyboard shortcut for conversation archive  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								48c4ed1a29 
								
							
								 
							
						 
						
							
							
								
								Partial Merge commit 'bf904ddd129ceba8fa363ccf6d10ecd256c65f63' into signal-1.23  
							
							... 
							
							
							
							# Conflicts:
#	_locales/en/messages.json
#	app/sql.js
#	js/background.js
#	js/conversation_controller.js
#	js/models/conversations.js
#	js/views/inbox_view.js
#	main.js 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								57195017f9 
								
							
								 
							
						 
						
							
							
								
								Linting  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								22f7a352f9 
								
							
								 
							
						 
						
							
							
								
								updateLastMessage: If we don't update last text, clear it  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								0ffda78ecb 
								
							
								 
							
						 
						
							
							
								
								Update libphonenumber dependency  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								5a50786e7a 
								
							
								 
							
						 
						
							
							
								
								Lint fixes  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a450cdf528 
								
							
								 
							
						 
						
							
							
								
								Lint fixes for recent PRs  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								7727dc093e 
								
							
								 
							
						 
						
							
							
								
								Hides the "Hide menu bar" option on MacOS ( #2903 )  
							
							... 
							
							
							
							The "Hide menu bar" option is only applicable to Windows and some Linux distros,
where the menu bar is attached to the Signal window. Therefore, this commit
ensures that it doesn't show up on MacOS. It includes a setting,
isHideMenuBarSupported(), to control the option's appearance. This
commit also includes the tests to make sure isHideMenuBarSupported()
works correctly.
Fixes  #2705  
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								3e16ea7b32 
								
							
								 
							
						 
						
							
							
								
								Add RTL support for author name in quote ( #2594 )  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1a76f1dae3 
								
							
								 
							
						 
						
							
							
								
								Make manual emoji text entry case-insensitive ( #2353 )  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								eae7660074 
								
							
								 
							
						 
						
							
							
								
								Downgrade to electron-builder@20.39.0 due to windows install bug  
							
							... 
							
							
							
							https://github.com/electron-userland/electron-builder/issues/3813  
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								c8ea2e9463 
								
							
								 
							
						 
						
							
							
								
								Download and install updates without the help of electron-updater  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a2fca80759 
								
							
								 
							
						 
						
							
							
								
								Conversation.updateLastMessage: Properly clear timestamp/status  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								81de5f9a76 
								
							
								 
							
						 
						
							
							
								
								Introduce CTRL-E shortcut for archiving a conversation  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								613d0ddd12 
								
							
								 
							
						 
						
							
							
								
								Lint fixes  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								d251282da1 
								
							
								 
							
						 
						
							
							
								
								Upgrade electron-builder and electron-updater  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								8833cd7de4 
								
							
								 
							
						 
						
							
							
								
								Skip URLs that include the @ symbol when generating links  
							
							... 
							
							
							
							Thanks to mcsim for the bug report. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								c1b680eeb4 
								
							
								 
							
						 
						
							
							
								
								Skip URLs that include the @ symbol when generating links  
							
							... 
							
							
							
							Thanks to mcsim for the bug report. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								230c6dc284 
								
							
								 
							
						 
						
							
							
								
								Fix vertical sizing of left pane when switching inbox<->archive  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								ba461eb44a 
								
							
								 
							
						 
						
							
							
								
								Update electron-updater to fix its handling of node_module pkging  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1c48db7df0 
								
							
								 
							
						 
						
							
							
								
								Update electron-builder/updater to fix build error on MacOS  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b3ac1373fa 
								
							
								 
							
						 
						
							
							
								
								Move left pane entirely to React  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								bf904ddd12 
								
							
								 
							
						 
						
							
							
								
								On attachment save include date, include album index  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								768007a269 
								
							
								 
							
						 
						
							
							
								
								Message Detail: Ensure that quotes are not clickable  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								e980e3cd22 
								
							
								 
							
						 
						
							
							
								
								Lint fixes  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								6ffbc0ac06 
								
							
								 
							
						 
						
							
							
								
								Archive Conversation  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								d72f89d776 
								
							
								 
							
						 
						
							
							
								
								Render only visible conversations in left pane  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								031b64a476 
								
							
								 
							
						 
						
							
							
								
								Disable full-text search until we can go to arbitrary messages  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ae161c6cf6 
								
							
								 
							
						 
						
							
							
								
								Update to Electron 4.x  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ae2db9f09a 
								
							
								 
							
						 
						
							
							
								
								Improve handling for URLs composed of mixed character sets  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								14367620d9 
								
							
								 
							
						 
						
							
							
								
								lint  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								d0d57ea8c7 
								
							
								 
							
						 
						
							
							
								
								Add more functionality to the conversation right click menu, add right click for messages, change some of the ways toasts/confirmation dialogs are created, auto focus text input for nickname, clean up some stuff  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								df93c97b48 
								
							
								 
							
						 
						
							
							
								
								Added ability to delete contacts and destroy all sessions with them. Added right click menu to contacts/conversations in list which can block, delete messages and delete contact  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								9ac76e7e62 
								
							
								 
							
						 
						
							
							
								
								Linting  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								06be1da40d 
								
							
								 
							
						 
						
							
							
								
								Added p2p message styling  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								d574c2a1e4 
								
							
								 
							
						 
						
							
							
								
								Lint fixes  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ca0c0133e9 
								
							
								 
							
						 
						
							
							
								
								Lint fixes  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								e12e120355 
								
							
								 
							
						 
						
							
							
								
								Lint fixes  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								3f8223ff48 
								
							
								 
							
						 
						
							
							
								
								Revert electron-builder upgrade due to bugs  
							
							... 
							
							
							
							This reverts commit 8a3acc6b7e 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								9c540ab977 
								
							
								 
							
						 
						
							
							
								
								Add cache support to Signal Protocol Store  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1d2c3ae23c 
								
							
								 
							
						 
						
							
							
								
								Download attachments in separate queue from message processing  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a43a78731a 
								
							
								 
							
						 
						
							
							
								
								Note to Self  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								ddfc99a461 
								
							
								 
							
						 
						
							
							
								
								Added online indicator to conversation header.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								9b382de6da 
								
							
								 
							
						 
						
							
							
								
								Added online indicator.  
							
							... 
							
							
							
							Disable selection in contacts. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								4d69e109b8 
								
							
								 
							
						 
						
							
							
								
								Lint fixes  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1533fcc807 
								
							
								 
							
						 
						
							
							
								
								Fail over to all numbers in retry if errors don't have numbers  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								8a3acc6b7e 
								
							
								 
							
						 
						
							
							
								
								Update electron-builder and electron-updater  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								589a66c78c 
								
							
								 
							
						 
						
							
							
								
								Lint fixes  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								813924685e 
								
							
								 
							
						 
						
							
							
								
								Link Previews  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								51f1ef5725 
								
							
								 
							
						 
						
							
							
								
								Don't linkify quoted message contents  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1a15ec9c15 
								
							
								 
							
						 
						
							
							
								
								Merge commit signal/master into signal-1.20  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								6bd2d3962e 
								
							
								 
							
						 
						
							
							
								
								Linted files  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								74bbdb88a5 
								
							
								 
							
						 
						
							
							
								
								Lint fixes  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								0de54e125c 
								
							
								 
							
						 
						
							
							
								
								Improve caption editor usability, new 'add attachment' affordance  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								7db7a3ad44 
								
							
								 
							
						 
						
							
							
								
								Preserve scroll position when adding/removing staged quote  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								6863f7e51a 
								
							
								 
							
						 
						
							
							
								
								Small fix for strange bug where timezone would be different in the past for regular user vs sudo  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								cba47668cd 
								
							
								 
							
						 
						
							
							
								
								Increase contrast of typing indicator in iOS theme  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								57abb8300f 
								
							
								 
							
						 
						
							
							
								
								Upgrade Electron to 3.0.14  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								aab2a57b48 
								
							
								 
							
						 
						
							
							
								
								Some style and interaction fine-tuning  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a900792a06 
								
							
								 
							
						 
						
							
							
								
								Use thumbnails for smaller cells in image grids  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ba711d8985 
								
							
								 
							
						 
						
							
							
								
								Show just first image if we receive mixed multi-attachment msg  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								52d3138958 
								
							
								 
							
						 
						
							
							
								
								Caption editor: add keyboard interaction, disable for single img  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b08c10a547 
								
							
								 
							
						 
						
							
							
								
								FileInputView: Event on attachment change to hide/show microphone  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								6eb8f5680c 
								
							
								 
							
						 
						
							
							
								
								Preserve links with embedded emoji  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f9ea7be61f 
								
							
								 
							
						 
						
							
							
								
								Reintroduce single attachment limit  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								985b1d6aa6 
								
							
								 
							
						 
						
							
							
								
								New staged attachments UI, multiple image attachments per message  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								e4babdaef0 
								
							
								 
							
						 
						
							
							
								
								Updates to backup infrastructure  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								47f834cf5c 
								
							
								 
							
						 
						
							
							
								
								Encrypt device name on account create, on first launch if needed  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f3367465d8 
								
							
								 
							
						 
						
							
							
								
								Fix menu items not triggering after conversation is removed and then added.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								27674513ba 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'development' into signal-v1.19  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a2f12ca18e 
								
							
								 
							
						 
						
							
							
								
								Added option to copy conversation public key.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								654b0dac84 
								
							
								 
							
						 
						
							
							
								
								Merge signal-master.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f45f8b190d 
								
							
								 
							
						 
						
							
							
								
								Remove unused lint exceptions  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								7e612700f7 
								
							
								 
							
						 
						
							
							
								
								Handle session reset, Loki style  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								eb7a0dbb3a 
								
							
								 
							
						 
						
							
							
								
								Fix failing tests except for problematic spellcheck package  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								341c5e4ed8 
								
							
								 
							
						 
						
							
							
								
								Updated nickname display modal.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								51e8bc40b6 
								
							
								 
							
						 
						
							
							
								
								Show public key tooltip when you hover over profile text.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								14ecbc3f35 
								
							
								 
							
						 
						
							
							
								
								Moved MainHeader into its own Backbone View.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a807b6eacd 
								
							
								 
							
						 
						
							
							
								
								Show expand icon on main header.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								cb3599eea8 
								
							
								 
							
						 
						
							
							
								
								Removed IdentityKeyHeader.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1be63b52b2 
								
							
								 
							
						 
						
							
							
								
								Show contact name on main header.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								822ea9ae53 
								
							
								 
							
						 
						
							
							
								
								Improve sealed sender icon display logic  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								313d08344a 
								
							
								 
							
						 
						
							
							
								
								Request configuration sync on startup of new version  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f5954db711 
								
							
								 
							
						 
						
							
							
								
								Ensure that multi-video lightbox scrolling changes video  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ac4e04912c 
								
							
								 
							
						 
						
							
							
								
								Minor language fixes.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								98c4b5d77b 
								
							
								 
							
						 
						
							
							
								
								Added editing own nickname.  
							
							... 
							
							
							
							Fix dark theme support.
Fix notification titles. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								449f44cc5a 
								
							
								 
							
						 
						
							
							
								
								Added changing user nicknames.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f1d18219ed 
								
							
								 
							
						 
						
							
							
								
								Conversation UI update.  
							
							
							
						 
						
							7 years ago