e83912e449 
								
									
								
							
								 
							
						 
						
							
							
								
								avatar placeholder skip first 05 for initial from pubkey  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								1da4ae69c2 
								
									
								
							
								 
							
						 
						
							
							
								
								render NoteToSelf list item as a normal conversation  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								1eb8f8e6b1 
								
									
								
							
								 
							
						 
						
							
							
								
								remove ConfirmationDialogView unused  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								5f51573f53 
								
									
								
							
								 
							
						 
						
							
							
								
								remove unused templates  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								a4397ceeb3 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/clearnet' into fix-drop-message-closed-group  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								e806e912a3 
								
									
								
							
								 
							
						 
						
							
							
								
								move password_utils.js to typescript  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								64dff64925 
								
									
								
							
								 
							
						 
						
							
							
								
								fix mentions notification displayname rather than pubkeys  
							
							... 
							
							
							
							* replace @pubkeys with their corresponding display name if found
* fix the display of the @ sign on the conversationListItem 
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								cc43555cd2 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into medium-group-fixes  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								87144336b7 
								
							
								 
							
						 
						
							
							
								
								Large refactor of medium groups. Fixes them for multidevice  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								45cdbcbb2f 
								
									
								
							
								 
							
						 
						
							
							
								
								handle sync of blocked contact/groups as sync events  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								f008a8b3ef 
								
							
								 
							
						 
						
							
							
								
								Always block the primary device instead of all devices.  
							
							... 
							
							
							
							Added isBlockedAsync function. 
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								1b93a210bc 
								
							
								 
							
						 
						
							
							
								
								Comments  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								8c3943094d 
								
							
								 
							
						 
						
							
							
								
								Add tests  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								aa75205bbd 
								
							
								 
							
						 
						
							
							
								
								Move BlockedNumberController to ts  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								653efaf9cf 
								
							
								 
							
						 
						
							
							
								
								Fixed libsignal-protocol declaration  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								cd58e9b86e 
								
							
								 
							
						 
						
							
							
								
								Add utils for stubbing.  
							
							... 
							
							
							
							Added ImportMock for easier es6 stubbing. 
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								b644e2a05f 
								
							
								 
							
						 
						
							
							
								
								Added more types.  
							
							... 
							
							
							
							Finalise MessageEncrypter. 
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								fa853538d0 
								
									
								
							
								 
							
						 
						
							
							
								
								LINT after prettier upgrade  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								24a3e05154 
								
									
								
							
								 
							
						 
						
							
							
								
								Revert "Revert "Clean up unused dependencies.""  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5ff7476359 
								
									
								
							
								 
							
						 
						
							
							
								
								Revert "Clean up unused dependencies."  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								eed0ea058c 
								
							
								 
							
						 
						
							
							
								
								Removed other dependencies  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								1cadb01e8d 
								
							
								 
							
						 
						
							
							
								
								Remove intl-tel-input  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d671ce0055 
								
							
								 
							
						 
						
							
							
								
								Remove phone number libraries  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a09e370e1d 
								
							
								 
							
						 
						
							
							
								
								Added testing on pull request  
							
							... 
							
							
							
							Disable proxy in tests. 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								92c3e19865 
								
							
								 
							
						 
						
							
							
								
								Don't show relative timestamp.  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								61b862b021 
								
							
								 
							
						 
						
							
							
								
								Merge signal 1.24.1  
							
							
							
						 
						
							7 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  
				
					
						
							
							
								 
						
							
							
								3152f92e30 
								
							
								 
							
						 
						
							
							
								
								Merge signal 1.23.2  
							
							... 
							
							
							
							# Conflicts:
#	app/sql.js
#	js/conversation_controller.js
#	package.json 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								42c501e7f8 
								
							
								 
							
						 
						
							
							
								
								Merge v1.23.1  
							
							... 
							
							
							
							# Conflicts:
#	package.json 
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								fca40cb548 
								
							
								 
							
						 
						
							
							
								
								Disable keyboard shortcut for conversation archive  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								0ffda78ecb 
								
							
								 
							
						 
						
							
							
								
								Update libphonenumber dependency  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								5a50786e7a 
								
							
								 
							
						 
						
							
							
								
								Lint fixes  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a450cdf528 
								
							
								 
							
						 
						
							
							
								
								Lint fixes for recent PRs  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1a76f1dae3 
								
							
								 
							
						 
						
							
							
								
								Make manual emoji text entry case-insensitive ( #2353 )  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								eae7660074 
								
							
								 
							
						 
						
							
							
								
								Downgrade to electron-builder@20.39.0 due to windows install bug  
							
							... 
							
							
							
							https://github.com/electron-userland/electron-builder/issues/3813  
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								c8ea2e9463 
								
							
								 
							
						 
						
							
							
								
								Download and install updates without the help of electron-updater  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								81de5f9a76 
								
							
								 
							
						 
						
							
							
								
								Introduce CTRL-E shortcut for archiving a conversation  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								613d0ddd12 
								
							
								 
							
						 
						
							
							
								
								Lint fixes  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								d251282da1 
								
							
								 
							
						 
						
							
							
								
								Upgrade electron-builder and electron-updater  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								230c6dc284 
								
							
								 
							
						 
						
							
							
								
								Fix vertical sizing of left pane when switching inbox<->archive  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								ba461eb44a 
								
							
								 
							
						 
						
							
							
								
								Update electron-updater to fix its handling of node_module pkging  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1c48db7df0 
								
							
								 
							
						 
						
							
							
								
								Update electron-builder/updater to fix build error on MacOS  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b3ac1373fa 
								
							
								 
							
						 
						
							
							
								
								Move left pane entirely to React  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								768007a269 
								
							
								 
							
						 
						
							
							
								
								Message Detail: Ensure that quotes are not clickable  
							
							
							
						 
						
							7 years ago