874e3f863b 
								
									
								
							
								 
							
						 
						
							
							
								
								remove unused worker  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								a51f95d28c 
								
									
								
							
								 
							
						 
						
							
							
								
								move models to TS part1  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								02fb5783a4 
								
									
								
							
								 
							
						 
						
							
							
								
								remove regionCode and PhoneNumber.ts  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								a6cecd33e3 
								
							
								 
							
						 
						
							
							
								
								remove ContactDetails unused  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								135fc3b366 
								
									
								
							
								 
							
						 
						
							
							
								
								remove prekeys  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								75b7788fa9 
								
									
								
							
								 
							
						 
						
							
							
								
								remove stuff related to web api  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								2fe6b11e89 
								
									
								
							
								 
							
						 
						
							
							
								
								move ConversationController to typescript  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								2bcc7be3e6 
								
									
								
							
								 
							
						 
						
							
							
								
								remove mp3 lame already file and webrecorder worker unused  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								3df0a425de 
								
									
								
							
								 
							
						 
						
							
							
								
								remove permissions popup window and related stuff  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								7e72566cba 
								
							
								 
							
						 
						
							
							
								
								remove list_view.js ListView is unused  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								6afe893359 
								
									
								
							
								 
							
						 
						
							
							
								
								fix up a few test  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								f5818817e9 
								
									
								
							
								 
							
						 
						
							
							
								
								remove references to old emoji-panel package  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								363da7aa80 
								
									
								
							
								 
							
						 
						
							
							
								
								add back toast on attachment adding error  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								c41eaada25 
								
									
								
							
								 
							
						 
						
							
							
								
								move display of message list to a subcomponent  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								4d991d3992 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into react-refactor  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								1eb8f8e6b1 
								
									
								
							
								 
							
						 
						
							
							
								
								remove ConfirmationDialogView unused  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								5f51573f53 
								
									
								
							
								 
							
						 
						
							
							
								
								remove unused templates  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								d823e2a758 
								
							
								 
							
						 
						
							
							
								
								safety-number-view  
							
							
							
						 
						
							5 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  
				
					
						
							
							
								 
						
							
							
								a09e370e1d 
								
							
								 
							
						 
						
							
							
								
								Added testing on pull request  
							
							... 
							
							
							
							Disable proxy in tests. 
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								e980e3cd22 
								
							
								 
							
						 
						
							
							
								
								Lint fixes  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								6ffbc0ac06 
								
							
								 
							
						 
						
							
							
								
								Archive Conversation  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ae161c6cf6 
								
							
								 
							
						 
						
							
							
								
								Update to Electron 4.x  
							
							
							
						 
						
							7 years ago