7867f4dceb 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into brand-redesign  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								ff7d2468ca 
								
							
								 
							
						 
						
							
							
								
								Delete channel / group merge  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d13efafad2 
								
									
								
							
								 
							
						 
						
							
							
								
								"Leave {Closed|Open} Group" button depending on group opened  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								293eca0509 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'brand-redesign' into clearnet  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2194a3a537 
								
							
								 
							
						 
						
							
							
								
								HARDCODE theme to be dark, even if an old config is set to be light mode enabled  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								24bf436b0c 
								
							
								 
							
						 
						
							
							
								
								disable menubar by default and remove old preferences from menubar  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								25344685a2 
								
							
								 
							
						 
						
							
							
								
								merge  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								411b343e6a 
								
							
								 
							
						 
						
							
							
								
								add unpairing of device from settings  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								4d950f859b 
								
							
								 
							
						 
						
							
							
								
								add back link device in settings in a dialog  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e065cc404f 
								
							
								 
							
						 
						
							
							
								
								Password set, change and remove complete  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								67262c7eaa 
								
							
								 
							
						 
						
							
							
								
								lint after merge and fix startup of app  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9b8ad976e3 
								
							
								 
							
						 
						
							
							
								
								remove not used AddServerDialog -> now on chanel section  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8de2ce9e23 
								
							
								 
							
						 
						
							
							
								
								Theme toggle and settings abstraction  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5360968a91 
								
							
								 
							
						 
						
							
							
								
								Add public server modal to message pane  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d20d62e8c6 
								
							
								 
							
						 
						
							
							
								
								Messages display temporary fix and panel optimisations  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								dd421d58f1 
								
							
								 
							
						 
						
							
							
								
								Theme switching. Need to update _session*_light  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e7d3bc6d35 
								
							
								 
							
						 
						
							
							
								
								Settings view modals and categories  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2d01275ede 
								
							
								 
							
						 
						
							
							
								
								QR Code responds to theme changes  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2caffa9289 
								
							
								 
							
						 
						
							
							
								
								Dependencies resorted and modal adjustments  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								ccd037201b 
								
							
								 
							
						 
						
							
							
								
								remove unused sessionIconButton class under /session  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								cc97d9284b 
								
							
								 
							
						 
						
							
							
								
								add first chunck of our SessionRegistrationView  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5730a88c18 
								
							
								 
							
						 
						
							
							
								
								add/remove moderator modal dialogs  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								4d105f5c66 
								
							
								 
							
						 
						
							
							
								
								Simplified icons object  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5123fa0409 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #669  from msgmaxim/restoration  
							
							... 
							
							
							
							Prompting the user to reset session on invalid ciphertext 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								81bfa90943 
								
							
								 
							
						 
						
							
							
								
								Prompting the user to reset session on invalid ciphertext  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9992a3da1d 
								
							
								 
							
						 
						
							
							
								
								Add a showUserDetails modal to display user's details  
							
							... 
							
							
							
							Relates #655  
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2ab0d084f1 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #645  from msgmaxim/group-invites  
							
							... 
							
							
							
							Public chat invitations 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a5fce17d8c 
								
							
								 
							
						 
						
							
							
								
								public chat invitations  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								db0068b429 
								
							
								 
							
						 
						
							
							
								
								Sending and handling of special UNPAIRING_REQUEST message  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								4dd314c18f 
								
							
								 
							
						 
						
							
							
								
								Enable profile pictures  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								685ada5cc5 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into prep-merge  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8c79800cee 
								
							
								 
							
						 
						
							
							
								
								Use oninput for secondary devices names and allow for consecutive pairings without closing the dialog  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9f81f67460 
								
							
								 
							
						 
						
							
							
								
								Can leave private 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  
				
					
						
							
							
								 
						
							
							
								65361d33f5 
								
							
								 
							
						 
						
							
							
								
								New menu item "show pairing words" for secondary devices  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								bd16bc5b9b 
								
							
								 
							
						 
						
							
							
								
								lint  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								6de6b762e6 
								
							
								 
							
						 
						
							
							
								
								Ensure the latest contact signed prekey is used  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3380500a2d 
								
							
								 
							
						 
						
							
							
								
								Added QR code viewing.  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								79d842635d 
								
							
								 
							
						 
						
							
							
								
								fix events registration issues  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								ac4038e86a 
								
							
								 
							
						 
						
							
							
								
								Dialogs for device pairing requests - Primary device side  
							
							
							
						 
						
							6 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  
				
					
						
							
							
								 
						
							
							
								b3ac1373fa 
								
							
								 
							
						 
						
							
							
								
								Move left pane entirely to React  
							
							
							
						 
						
							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