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  
				
					
						
							
							
								 
						
							
							
								662c64f347 
								
							
								 
							
						 
						
							
							
								
								Remove ability to delete some rss conversations  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								47ac247f83 
								
							
								 
							
						 
						
							
							
								
								Comment out the show all media button  
							
							
							
						 
						
							6 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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								b3ac1373fa 
								
							
								 
							
						 
						
							
							
								
								Move left pane entirely to React  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								6ffbc0ac06 
								
							
								 
							
						 
						
							
							
								
								Archive Conversation  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								a43a78731a 
								
							
								 
							
						 
						
							
							
								
								Note to Self  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ddfc99a461 
								
							
								 
							
						 
						
							
							
								
								Added online indicator to conversation header.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								6bd2d3962e 
								
							
								 
							
						 
						
							
							
								
								Linted files  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f3367465d8 
								
							
								 
							
						 
						
							
							
								
								Fix menu items not triggering after conversation is removed and then added.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a2f12ca18e 
								
							
								 
							
						 
						
							
							
								
								Added option to copy conversation public key.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								341c5e4ed8 
								
							
								 
							
						 
						
							
							
								
								Updated nickname display modal.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								449f44cc5a 
								
							
								 
							
						 
						
							
							
								
								Added changing user nicknames.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f1d18219ed 
								
							
								 
							
						 
						
							
							
								
								Conversation UI update.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ae2e2fa2ae 
								
							
								 
							
						 
						
							
							
								
								Updated UI in conversation to support user blocking behaviour.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								4b9fcb98d4 
								
							
								 
							
						 
						
							
							
								
								Linting and other housekeeping stuff  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								9370e2b74a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/signalapp/Signal-Desktop  into development  
							
							... 
							
							
							
							* 'master' of https://github.com/signalapp/Signal-Desktop : (38 commits)
  v1.17.0
  v1.17.0-beta.4
  Ensure that blue group avatars are preserved in dark theme
  Android theme: Incoming quotes take color from containing message
  Conversations have blue avatar backgrounds if no image provided
  Fix lint errors
  Add ca language
  inboxView: Ensure Conversation exists for our own number
  Ensure that file is not attached if we've filtered it
  v1.17.0-beta.3
  Localization updates
  v1.16.3
  Lint fixes
  Lint fixes
  Better handle large numbers of messages in cache on startup
  Keep object stores after conversations migrate to SQLCipher
  Longer timeout for orphaned file cleanup
  Tests and increase consistency for isFileDangerous calls
  Longer timeout for orphaned file cleanup
  v1.17.0-beta.2
  ...
# Conflicts:
#	background.html
#	package.json 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								8f3e3b7aaf 
								
							
								 
							
						 
						
							
							
								
								Update to new design for avatars: individual/group icons/colors  
							
							... 
							
							
							
							And two initials. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								22a86b5351 
								
							
								 
							
						 
						
							
							
								
								store key bundle status in conversation model  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								3b7ee3e2ce 
								
							
								 
							
						 
						
							
							
								
								A couple copy changes: Show -> View, New Number -> Safety Number  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								7dd931fb7e 
								
							
								 
							
						 
						
							
							
								
								ConversationHeader: centered title, ConvoListItem: unbold name  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								2384988b0a 
								
							
								 
							
						 
						
							
							
								
								ConversationHeader: Ensure that profile has tilde before it  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								3c69886320 
								
							
								 
							
						 
						
							
							
								
								Finish new Message component, integrate into application  
							
							... 
							
							
							
							Also:
- New schema version 8 with video/image thumbnails, screenshots, sizes
- Upgrade messages not at current schema version when loading messages
  to show in conversation
- New MessageDetail react component
- New ConversationHeader react component 
							
						 
						
							7 years ago