Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								5710c1268c 
								
							
								 
							
						 
						
							
							
								
								Revert id field and add new url field to be compatible with mobile  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								4e85435bf7 
								
							
								 
							
						 
						
							
							
								
								Update attachment pipeline to upload and download from loki fileserver  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Campbell-Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								6eef0b6d6b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #559  from BeaudanBrown/mention-bug  
							
							 
							
							... 
							
							
							
							Check against null message body when detecting mentions 
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								29e83cadbf 
								
							
								 
							
						 
						
							
							
								
								Check against null message body when detecting mentions  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
								
								
							
							
								
							
								9c7168d65d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #558  from msgmaxim/no-overflow  
							
							 
							
							... 
							
							
							
							Prevent chat member's pubkey from overflowing 
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								c477661af0 
								
							
								 
							
						 
						
							
							
								
								Prevent chat member's pubkey from overflowing  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
								
								
							
							
								
							
								866b8f005f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #556  from msgmaxim/multi2  
							
							 
							
							... 
							
							
							
							Cherry-pick Beaudan's start-multi2 commit 
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								8708943fd3 
								
							
								 
							
						 
						
							
							
								
								Add yarn start-multi2 to allow for easier multi device testing (3 clients, 2 are linked)  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Campbell-Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								e53ad35a7c 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #550  from BeaudanBrown/signing-update  
							
							 
							
							... 
							
							
							
							Signing update 
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								9ed3ec5dec 
								
							
								 
							
						 
						
							
							
								
								Fix linting  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								399c54452e 
								
							
								 
							
						 
						
							
							
								
								Default user name to anonymouse if they don't have one set  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								f9f7a799b5 
								
							
								 
							
						 
						
							
							
								
								Updating signature scheme to use hard coded fields  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
								
								
							
							
								
							
								e26f764fca 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #549  from msgmaxim/mentions5  
							
							 
							
							... 
							
							
							
							Highlight conversations with unread mentions of the user 
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
								
								
							
							
								
							
								5f3342fa42 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #538  from msgmaxim/mentions4  
							
							 
							
							... 
							
							
							
							Show mentions as profile names and treat them as indivisible elements 
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Campbell-Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								cfbde318d9 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #540  from BeaudanBrown/restrict-names  
							
							 
							
							... 
							
							
							
							Restrict username characters 
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								8be1c61f4c 
								
							
								 
							
						 
						
							
							
								
								Highlight conversations with unread mentions of the user  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								64ccd05a2e 
								
							
								 
							
						 
						
							
							
								
								Capitalise constants  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								7b0f40535f 
								
							
								 
							
						 
						
							
							
								
								QoL with auto focus display name box and enter/esc key functionality on profile screen. Restrict display name characters to alphanumeric (easy to work around)  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								0980eafe74 
								
							
								 
							
						 
						
							
							
								
								First round of code review addressed  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								4e39f1e0eb 
								
							
								 
							
						 
						
							
							
								
								When composing: show mentions as profile names and treat them as indivisible elements  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								c3ee6240c2 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #527  from sachaaaaa/default_active_at  
							
							 
							
							... 
							
							
							
							set active_at to now() for public channels 
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								dc28ea3be3 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #518  from sachaaaaa/PR_file_server  
							
							 
							
							... 
							
							
							
							Add Annotation endpoint and LokiFileServerAPI 
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								7d7eea9547 
								
							
								 
							
						 
						
							
							
								
								set active_at to now() for public channels  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								7549c45716 
								
							
								 
							
						 
						
							
							
								
								yarn lint  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								a28c581666 
								
							
								 
							
						 
						
							
							
								
								return early if signature is not a string  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								a931b2491a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into PR_file_server  
							
							 
							
							... 
							
							
							
							* clearnet:
  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 reviews
  Custom message rendering of mentions
  lint and remove unneeded params
  modernize annotations since we're making a backward-incomp change
  sign and only show verified messages
# Conflicts:
#	js/modules/loki_public_chat_api.js 
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								035c48eb12 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #517  from neuroscr/publicchat_signed  
							
							 
							
							... 
							
							
							
							sign and only show verified public chat messages 
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Tharp
							
						 
						
							 
							
							
								
								
							
							
								
							
								34b7117ff7 
								
									
								
							
								 
							
						 
						
							
							
								
								lint pass 2  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Tharp
							
						 
						
							 
							
							
								
								
							
							
								
							
								8bfb7f297d 
								
									
								
							
								 
							
						 
						
							
							
								
								lint pass 1  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								b13a4f3e56 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #520  from msgmaxim/mentions2  
							
							 
							
							... 
							
							
							
							Custom message rendering of mentions 
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Tharp
							
						 
						
							 
							
							
								
								
							
							
								
							
								6ac6d656a4 
								
									
								
							
								 
							
						 
						
							
							
								
								make sure versioning on write can't get out of sync  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Tharp
							
						 
						
							 
							
							
								
								
							
							
								
							
								ab440a699f 
								
									
								
							
								 
							
						 
						
							
							
								
								Update js/modules/loki_public_chat_api.js  
							
							 
							
							... 
							
							
							
							Co-Authored-By: sachaaaaa <40749766+sachaaaaa@users.noreply.github.com> 
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Tharp
							
						 
						
							 
							
							
								
								
							
							
								
							
								a976388315 
								
									
								
							
								 
							
						 
						
							
							
								
								Handle annotations omit correctly  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Tharp
							
						 
						
							 
							
							
								
								
							
							
								
							
								b62801bc2a 
								
									
								
							
								 
							
						 
						
							
							
								
								fix typo CI found  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Tharp
							
						 
						
							 
							
							
								
								
							
							
								
							
								968ad9227c 
								
									
								
							
								 
							
						 
						
							
							
								
								refactor  
							
							 
							
							... 
							
							
							
							pls forgive, using github editor for expedience, untested changes 
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Tharp
							
						 
						
							 
							
							
								
								
							
							
								
							
								c8cf05558f 
								
									
								
							
								 
							
						 
						
							
							
								
								pollOnceForMessages() move lastGot up, address Sacha's review  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Tharp
							
						 
						
							 
							
							
								
								
							
							
								
							
								d85cd980c2 
								
									
								
							
								 
							
						 
						
							
							
								
								Update js/modules/loki_public_chat_api.js  
							
							 
							
							... 
							
							
							
							oof
Co-Authored-By: sachaaaaa <40749766+sachaaaaa@users.noreply.github.com> 
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								e2e2d1e845 
								
							
								 
							
						 
						
							
							
								
								address review  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								7756d4f0f3 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into PR_file_server  
							
							 
							
							... 
							
							
							
							* clearnet:
  fix method
  separate out new/open, more lint/cleanup
  separate out note to self
  create window.mixpanel here
  use window.mixpanel, remove eventEmitter
  allow mixpanel to be already set up elsewhere
  Address review comments
  Add missing file in tests
  Add UI elements for searching and selecting members in a group chat
  Desktop Analytics
  Replaced value with a descriptive constant.
  Add comment to fix up confusion.
  Keep a cache of the last 5 fetched messages for public chat so we can use it to detect duplicate messages.
# Conflicts:
#	js/background.js
#	js/modules/loki_public_chat_api.js 
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								16692696e0 
								
							
								 
							
						 
						
							
							
								
								address reviews  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Tharp
							
						 
						
							 
							
							
								
								
							
							
								
							
								71fde0b9e6 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into publicchat_signed  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								155a3b8f17 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #512  from neuroscr/desktop-analytics  
							
							 
							
							... 
							
							
							
							Desktop Analytics 
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								a3d677819b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #508  from Mikunj/duplicate-message-fix  
							
							 
							
							... 
							
							
							
							Public chat duplicate message fix 
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								687e9db77b 
								
							
								 
							
						 
						
							
							
								
								Custom message rendering of mentions  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Tharp
							
						 
						
							 
							
							
							
								
							
								db8ac66118 
								
							
								 
							
						 
						
							
							
								
								fix method  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Tharp
							
						 
						
							 
							
							
							
								
							
								3150a6ce11 
								
							
								 
							
						 
						
							
							
								
								separate out new/open, more lint/cleanup  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Tharp
							
						 
						
							 
							
							
							
								
							
								d4ca49ae95 
								
							
								 
							
						 
						
							
							
								
								separate out note to self  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Tharp
							
						 
						
							 
							
							
							
								
							
								587df45086 
								
							
								 
							
						 
						
							
							
								
								create window.mixpanel here  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Tharp
							
						 
						
							 
							
							
							
								
							
								51eaa90823 
								
							
								 
							
						 
						
							
							
								
								use window.mixpanel, remove eventEmitter  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Tharp
							
						 
						
							 
							
							
							
								
							
								68186afba2 
								
							
								 
							
						 
						
							
							
								
								lint and remove unneeded params  
							
							 
							
							
							
						 
						
							6 years ago