027e17f7d0 
								
							
								 
							
						 
						
							
							
								
								Reset multi selection when conversation is deleted/changed  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								7c96990119 
								
							
								 
							
						 
						
							
							
								
								Correctly handle server errors in multi-deletion  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8677fb15a0 
								
							
								 
							
						 
						
							
							
								
								Select multiple messages and bulk deletion  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a2f836c690 
								
							
								 
							
						 
						
							
							
								
								Address review comments  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								7c05939f55 
								
							
								 
							
						 
						
							
							
								
								Add group admins and the ability to remove members from private groups  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0df5214979 
								
							
								 
							
						 
						
							
							
								
								Limit small private groups to 10 members  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9f81f67460 
								
							
								 
							
						 
						
							
							
								
								Can leave private group chats  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f5e9a870f7 
								
							
								 
							
						 
						
							
							
								
								Add support for mentions in private group chats  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								cf18572049 
								
							
								 
							
						 
						
							
							
								
								Adding new group members; establishing sessions between non-friends  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								6c08852118 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #593  from msgmaxim/not-friends  
							
							... 
							
							
							
							Fix incorrectly showing friend request as pending 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								279328f47b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #595  from msgmaxim/fix-rss  
							
							... 
							
							
							
							Clean up RSS conversation 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e64ccbdd2b 
								
							
								 
							
						 
						
							
							
								
								Clean up RSS conversation  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9e6f6d5a01 
								
							
								 
							
						 
						
							
							
								
								Fix incorrectly showing friend request as pending  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								1f4af59dad 
								
							
								 
							
						 
						
							
							
								
								Delete public chat messages locally if not stored on the server  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a3635216db 
								
							
								 
							
						 
						
							
							
								
								Enable sending audio recordings  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f52bc4d5b5 
								
							
								 
							
						 
						
							
							
								
								Cheeky lint and name change  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								b66abca17d 
								
							
								 
							
						 
						
							
							
								
								Disable files for friend requests  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e26f764fca 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #549  from msgmaxim/mentions5  
							
							... 
							
							
							
							Highlight conversations with unread mentions of the user 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8be1c61f4c 
								
							
								 
							
						 
						
							
							
								
								Highlight conversations with unread mentions of the user  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0980eafe74 
								
							
								 
							
						 
						
							
							
								
								First round of code review addressed  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								4e39f1e0eb 
								
							
								 
							
						 
						
							
							
								
								When composing: show mentions as profile names and treat them as indivisible elements  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								16692696e0 
								
							
								 
							
						 
						
							
							
								
								address reviews  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								687e9db77b 
								
							
								 
							
						 
						
							
							
								
								Custom message rendering of mentions  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								c54979bb41 
								
							
								 
							
						 
						
							
							
								
								Address review comments  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								1496a368e9 
								
							
								 
							
						 
						
							
							
								
								Add UI elements for searching and selecting members in a group chat  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9beea2cbd3 
								
							
								 
							
						 
						
							
							
								
								Enforce curlies completely and lint with new settings  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								c4a95218fa 
								
							
								 
							
						 
						
							
							
								
								Make even smaller  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3894f2784e 
								
							
								 
							
						 
						
							
							
								
								Clean up redundant repetition  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								66459ac4bd 
								
							
								 
							
						 
						
							
							
								
								Remove most of the right click and cog menu options for the public chats  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								351fa09ad6 
								
							
								 
							
						 
						
							
							
								
								Only show delete option if have mod status and show different modal for mod deletion  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								662c64f347 
								
							
								 
							
						 
						
							
							
								
								Remove ability to delete some rss conversations  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								3a8111020e 
								
							
								 
							
						 
						
							
							
								
								Merge v1.23.0  
							
							... 
							
							
							
							# Conflicts:
#	background.html
#	package.json
#	yarn.lock 
							
						 
						
							7 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  
				
					
						
							
							
								 
						
							
							
								48c4ed1a29 
								
							
								 
							
						 
						
							
							
								
								Partial Merge commit 'bf904ddd129ceba8fa363ccf6d10ecd256c65f63' into signal-1.23  
							
							... 
							
							
							
							# Conflicts:
#	_locales/en/messages.json
#	app/sql.js
#	js/background.js
#	js/conversation_controller.js
#	js/models/conversations.js
#	js/views/inbox_view.js
#	main.js 
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								b31fbcaa17 
								
							
								 
							
						 
						
							
							
								
								Don't send if message body is too long  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								629dc8737b 
								
							
								 
							
						 
						
							
							
								
								Fix issue where 'delete messages' was not clickable second time  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								81de5f9a76 
								
							
								 
							
						 
						
							
							
								
								Introduce CTRL-E shortcut for archiving a conversation  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								74cb808763 
								
							
								 
							
						 
						
							
							
								
								New MessageController as the single place for in-memory messages  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b232d6289a 
								
							
								 
							
						 
						
							
							
								
								Update react-contextmenu to avoid event handler issues un unload  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								3b140d9b51 
								
							
								 
							
						 
						
							
							
								
								Update react-contextmenu to avoid event handler issues un unload  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								8c4d90df07 
								
							
								 
							
						 
						
							
							
								
								Send long text as an attachment instead of inline  
							
							... 
							
							
							
							Remove Android length warning
Handle incoming long message attachments
Show long download pending status in message bubble
Fix the width of the smallest spinner
Remove Android length warning from HTML templates 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b3ac1373fa 
								
							
								 
							
						 
						
							
							
								
								Move left pane entirely to React  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								bf904ddd12 
								
							
								 
							
						 
						
							
							
								
								On attachment save include date, include album index  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								6ffbc0ac06 
								
							
								 
							
						 
						
							
							
								
								Archive Conversation  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								667b2e63f1 
								
							
								 
							
						 
						
							
							
								
								Ensure image lightbox is aware of its underlying message changes  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								9717267b00 
								
							
								 
							
						 
						
							
							
								
								Review  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								14367620d9 
								
							
								 
							
						 
						
							
							
								
								lint  
							
							
							
						 
						
							7 years ago