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  
						
					 
				
					
						
							
							
								 
								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  
						
					 
				
					
						
							
							
								 
								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
							
						 
						
							 
							
							
							
								
							
								3150a6ce11 
								
							
								 
							
						 
						
							
							
								
								separate out new/open, more lint/cleanup  
							
							 
							
							
							
						 
						
							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  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								3b450e28da 
								
							
								 
							
						 
						
							
							
								
								lint  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								e07f81c150 
								
							
								 
							
						 
						
							
							
								
								Add LokiFileServerAPI  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								dc6d3b5ca2 
								
							
								 
							
						 
						
							
							
								
								Add LokiPublicChatAPI (extends LokiAppDotNetAPI)  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								33ea259d45 
								
							
								 
							
						 
						
							
							
								
								Rename file  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								fc00373897 
								
							
								 
							
						 
						
							
							
								
								Change LokiPublicChatAPI to LokiAppDotNetAPI, add annotations getter and setter  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Tharp
							
						 
						
							 
							
							
							
								
							
								a97788c7d9 
								
							
								 
							
						 
						
							
							
								
								modernize annotations since we're making a backward-incomp change  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Tharp
							
						 
						
							 
							
							
							
								
							
								a0b52826e9 
								
							
								 
							
						 
						
							
							
								
								sign and only show verified messages  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								1496a368e9 
								
							
								 
							
						 
						
							
							
								
								Add UI elements for searching and selecting members in a group chat  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Tharp
							
						 
						
							 
							
							
							
								
							
								88b44390bf 
								
							
								 
							
						 
						
							
							
								
								Desktop Analytics  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								75a527e828 
								
							
								 
							
						 
						
							
							
								
								Replaced value with a descriptive constant.  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								001d882273 
								
							
								 
							
						 
						
							
							
								
								Add comment to fix up confusion.  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								19b0dabe11 
								
							
								 
							
						 
						
							
							
								
								Keep a cache of the last 5 fetched messages for public chat so we can use it to detect duplicate messages.  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								3152637cdc 
								
							
								 
							
						 
						
							
							
								
								Fix more check on deletion.  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Tharp
							
						 
						
							 
							
							
							
								
							
								ca5275b410 
								
							
								 
							
						 
						
							
							
								
								better guard  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Tharp
							
						 
						
							 
							
							
							
								
							
								e6d22aab19 
								
							
								 
							
						 
						
							
							
								
								pass serverId back to the server  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								e6d62cb22c 
								
							
								 
							
						 
						
							
							
								
								Review changes.  
							
							 
							
							... 
							
							
							
							Increase mod time to 30 seconds. 
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								0b898612d9 
								
							
								 
							
						 
						
							
							
								
								Linting.  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								0883b1b650 
								
							
								 
							
						 
						
							
							
								
								Updated styles.  
							
							 
							
							... 
							
							
							
							Merge commit clearnet into mod-badges 
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								43976c6c43 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #494  from sachaaaaa/fix_last_hash  
							
							 
							
							... 
							
							
							
							Fix last hash all being NULL in database 
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Campbell-Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								ec5a69f1cf 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #489  from msgmaxim/replies  
							
							 
							
							... 
							
							
							
							Enable quotes in public chats 
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								3beb6004db 
								
							
								 
							
						 
						
							
							
								
								Fix last hash all being NULL in database  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								72b3d02b52 
								
							
								 
							
						 
						
							
							
								
								Poll for moderators, store them on the conversation and use the list to determine our own mod status  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								97746307f0 
								
							
								 
							
						 
						
							
							
								
								Make sure we are always updating the last deleted id  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								5cf63af3a3 
								
							
								 
							
						 
						
							
							
								
								Enable quotes in public chats  
							
							 
							
							
							
						 
						
							6 years ago