Ryan Tharp
							
						 
						
							 
							
							
							
								
							
								29090ad80a 
								
							
								 
							
						 
						
							
							
								
								add updatePublicGroupDialogTitle and strip trailing whitespace  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								vincentbavitz
							
						 
						
							 
							
							
								
								
							
							
								
							
								2e83881373 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #652  from vincentbavitz/public-ban  
							
							 
							
							... 
							
							
							
							Public ban 
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								07c39523e9 
								
							
								 
							
						 
						
							
							
								
								Show appropriate message in group invitation dialog on no friends  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								43a91ab672 
								
							
								 
							
						 
						
							
							
								
								Linted  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								bee5a89f14 
								
							
								 
							
						 
						
							
							
								
								Show toast on user ban  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								4581a20260 
								
							
								 
							
						 
						
							
							
								
								Add new string i18n stuff  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								89e5e919f2 
								
							
								 
							
						 
						
							
							
								
								Address more review comments  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								a5fce17d8c 
								
							
								 
							
						 
						
							
							
								
								public chat invitations  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								4dd314c18f 
								
							
								 
							
						 
						
							
							
								
								Enable profile pictures  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								5e27be9598 
								
							
								 
							
						 
						
							
							
								
								Change auto accept message  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								685ada5cc5 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into prep-merge  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								c168e34adf 
								
							
								 
							
						 
						
							
							
								
								Update multi device string to match mobile  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								cd2c4b993a 
								
							
								 
							
						 
						
							
							
								
								lint  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								497f42165a 
								
							
								 
							
						 
						
							
							
								
								Allow unpairing device  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								8677fb15a0 
								
							
								 
							
						 
						
							
							
								
								Select multiple messages and bulk deletion  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								13572c3524 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'multi-device' into paired_device_alias  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								b324421534 
								
							
								 
							
						 
						
							
							
								
								Allow primary device to assign local aliases to paired devices  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								a2f836c690 
								
							
								 
							
						 
						
							
							
								
								Address review comments  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								7c05939f55 
								
							
								 
							
						 
						
							
							
								
								Add group admins and the ability to remove members from private groups  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								0df5214979 
								
							
								 
							
						 
						
							
							
								
								Limit small private groups to 10 members  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								0490e5c668 
								
							
								 
							
						 
						
							
							
								
								Clean up conversation options for groups  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								9f81f67460 
								
							
								 
							
						 
						
							
							
								
								Can leave private group chats  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								90f1d4a6aa 
								
							
								 
							
						 
						
							
							
								
								Display error messages when creating/updating group chats  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								cf18572049 
								
							
								 
							
						 
						
							
							
								
								Adding new group members; establishing sessions between non-friends  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								0d19b708f9 
								
							
								 
							
						 
						
							
							
								
								Creating private group chats between friends  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								65361d33f5 
								
							
								 
							
						 
						
							
							
								
								New menu item "show pairing words" for secondary devices  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								9e6f6d5a01 
								
							
								 
							
						 
						
							
							
								
								Fix incorrectly showing friend request as pending  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								883feb668d 
								
							
								 
							
						 
						
							
							
								
								The rest of my multidevice work, send messages to all the correct devices and automatic friend request if not friends with a device  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								1b3f56dfd3 
								
							
								 
							
						 
						
							
							
								
								Update change nickname message  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								2f52995e18 
								
							
								 
							
						 
						
							
							
								
								Fix the delete messages button to not break the conversation  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								d97eced37b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into multi-device  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								a3635216db 
								
							
								 
							
						 
						
							
							
								
								Enable sending audio recordings  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								49fcb50d48 
								
							
								 
							
						 
						
							
							
								
								Update link preview settings to be cleaner  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								3ba71fad9e 
								
							
								 
							
						 
						
							
							
								
								Linting.  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								5e1e70ac8c 
								
							
								 
							
						 
						
							
							
								
								Enable link previews by default  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Campbell-Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								c9b11814a6 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #567  from BeaudanBrown/name-restriction  
							
							 
							
							... 
							
							
							
							Display name restrictions 2 
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								602ec1ccaf 
								
							
								 
							
						 
						
							
							
								
								Also block displayname characters in the edit display name menu and change spaces to underscores  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								5d2f7ddb20 
								
							
								 
							
						 
						
							
							
								
								Add messages needed for UI, bit of house work  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								39fac5fd02 
								
							
								 
							
						 
						
							
							
								
								Add initial add server UI skeleton  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								8ecf057386 
								
							
								 
							
						 
						
							
							
								
								Display list of paired device in modal  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								870dc7f904 
								
							
								 
							
						 
						
							
							
								
								Fix tests, refactor menu items to please linter and lint  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								66459ac4bd 
								
							
								 
							
						 
						
							
							
								
								Remove most of the right click and cog menu options for the public chats  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								21dad58537 
								
							
								 
							
						 
						
							
							
								
								Linting.  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								3380500a2d 
								
							
								 
							
						 
						
							
							
								
								Added QR code viewing.  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								e4ecc5b389 
								
							
								 
							
						 
						
							
							
								
								A prepare for message deletion  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								cdd374a4b2 
								
							
								 
							
						 
						
							
							
								
								Add a toggle option for typing indicators; use short ttl for them  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								b8ef6c2cc6 
								
							
								 
							
						 
						
							
							
								
								Loki changes  
							
							 
							
							... 
							
							
							
							Added friends section in search.
This is because contacts is now used in signal for something else and we don't want to clash meanings.
Styling fixes
Add dropdown options into mainheader
Updated styling
Restore StartNewConversation to the old ui style of loki messenger.
Fix friend search display.
Fix header expand animation.
Hooked up menu actions.
Linting.
More styling changes.
Fix tests.
Added back in the loki logo below the gutter.
Fix toast positioning.
Fix context menu showing incorrectly on virtual lists.
Added tabs.
Linting 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								8808100796 
								
							
								 
							
						 
						
							
							
								
								Merge signal-1.24.0  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	background.html
#	config/default.json
#	config/production.json
#	js/models/conversations.js
#	js/models/messages.js
#	js/views/conversation_view.js
#	js/views/inbox_view.js
#	js/views/settings_view.js
#	main.js
#	package.json
#	test/index.html
#	ts/components/conversation/ContactName.tsx
#	yarn.lock 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								3a8111020e 
								
							
								 
							
						 
						
							
							
								
								Merge v1.23.0  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	background.html
#	package.json
#	yarn.lock 
							
						 
						
							7 years ago