Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								4d991d3992 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into react-refactor  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								56cd42d34c 
								
									
								
							
								 
							
						 
						
							
							
								
								remove authorColor unused in Session  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								217cc04ad1 
								
									
								
							
								 
							
						 
						
							
							
								
								cleanup avatar rendering and add a 64px size  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								291982c2aa 
								
									
								
							
								 
							
						 
						
							
							
								
								cleanup css and themify missing stuff  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								5165bfdba4 
								
							
								 
							
						 
						
							
							
								
								jsx-emoji-overlay  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								d823e2a758 
								
							
								 
							
						 
						
							
							
								
								safety-number-view  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								5b69f19410 
								
							
								 
							
						 
						
							
							
								
								compositionbox  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								35218ec2d1 
								
							
								 
							
						 
						
							
							
								
								merged-w-clearnet  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								6c2043753f 
								
							
								 
							
						 
						
							
							
								
								Emoji panel init  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vince
							
						 
						
							 
							
							
								
								
							
							
								
							
								6bf3b6cef9 
								
									
								
							
								 
							
						 
						
							
							
								
								Session public chat icon  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								aeb04a3a44 
								
							
								 
							
						 
						
							
							
								
								onboarding messageview  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								9dcc851ebd 
								
							
								 
							
						 
						
							
							
								
								Updated all icon references  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								b7a70c7327 
								
							
								 
							
						 
						
							
							
								
								use rounded icons for app icon  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								aaf202b9f7 
								
							
								 
							
						 
						
							
							
								
								add session icon as app icon  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								3dd175fda2 
								
							
								 
							
						 
						
							
							
								
								update loading screen logo  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								2c80dec146 
								
							
								 
							
						 
						
							
							
								
								add session brand icon on registration page  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								d62f1c6e22 
								
							
								 
							
						 
						
							
							
								
								Inital conversation restructuring  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								a6fb54233a 
								
							
								 
							
						 
						
							
							
								
								Created generalised icon button component  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								ea5bc24253 
								
							
								 
							
						 
						
							
							
								
								Updated design  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								e9a2b57d37 
								
							
								 
							
						 
						
							
							
								
								Show crown icon for moderators  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								d0e73ed7f8 
								
							
								 
							
						 
						
							
							
								
								Add a button to paste pubkey from clipboard if valid  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								b3ac1373fa 
								
							
								 
							
						 
						
							
							
								
								Move left pane entirely to React  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								1d2c3ae23c 
								
							
								 
							
						 
						
							
							
								
								Download attachments in separate queue from message processing  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								a43a78731a 
								
							
								 
							
						 
						
							
							
								
								Note to Self  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								1a15ec9c15 
								
							
								 
							
						 
						
							
							
								
								Merge commit signal/master into signal-1.20  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								b8aa60b95d 
								
							
								 
							
						 
						
							
							
								
								Added loki icon.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								0de54e125c 
								
							
								 
							
						 
						
							
							
								
								Improve caption editor usability, new 'add attachment' affordance  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								985b1d6aa6 
								
							
								 
							
						 
						
							
							
								
								New staged attachments UI, multiple image attachments per message  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								654b0dac84 
								
							
								 
							
						 
						
							
							
								
								Merge signal-master.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								62135a1810 
								
							
								 
							
						 
						
							
							
								
								Added a section below conversation list.  
							
							 
							
							... 
							
							
							
							Fixed scrolling on conversations. 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								99252702e1 
								
							
								 
							
						 
						
							
							
								
								Support receiving multiple images in one messages  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								3789e94342 
								
							
								 
							
						 
						
							
							
								
								Added PoW loading icon.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								0850dc368a 
								
							
								 
							
						 
						
							
							
								
								Lint fixes  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								ca61c9cb85 
								
							
								 
							
						 
						
							
							
								
								Warnings for dangerous files  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								8f3e3b7aaf 
								
							
								 
							
						 
						
							
							
								
								Update to new design for avatars: individual/group icons/colors  
							
							 
							
							... 
							
							
							
							And two initials. 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								fedfbed304 
								
							
								 
							
						 
						
							
							
								
								Copy quoted message contents into quote on receipt  
							
							 
							
							... 
							
							
							
							Also:
  - visually distinguish any reference we couldn't verify on receipt
  - show toast on quote click if we can't scroll to message
  - toast visuals redesigned to match rest of app 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								e80857562a 
								
							
								 
							
						 
						
							
							
								
								Disappearing messages: show 'disabled' instead of 'set to off'  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								dc11db92f9 
								
							
								 
							
						 
						
							
							
								
								New React component: Message  
							
							 
							
							... 
							
							
							
							Also: Use react to render contects on the 'show group members' screen 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								cfe0bd0e79 
								
							
								 
							
						 
						
							
							
								
								Move to npm for several dependencies  
							
							 
							
							... 
							
							
							
							mustache
jQuery
underscore
backbone
mocha
chai
intl-tel-input 
							
						 
						
							8 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								47adbe4358 
								
							
								 
							
						 
						
							
							
								
								Minify new svg files  
							
							 
							
							
							
						 
						
							8 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								41be7f126b 
								
							
								 
							
						 
						
							
							
								
								Visuals for embedded contacts as well as contact detail screen  
							
							 
							
							
							
						 
						
							8 years ago  
						
					 
				
					
						
							
							
								 
								Daniel Gasienica
							
						 
						
							 
							
							
							
								
							
								f0895af6dc 
								
							
								 
							
						 
						
							
							
								
								Add right arrow SVG  
							
							 
							
							
							
						 
						
							8 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
								
								
							
							
								
							
								37cac717cb 
								
									
								
							
								 
							
						 
						
							
							
								
								Use fit: cover for non-square thumbnails, better movie icon  
							
							 
							
							... 
							
							
							
							Also: Match Android's X button in the quote composition area 
							
						 
						
							8 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
								
								
							
							
								
							
								c71dcf0139 
								
									
								
							
								 
							
						 
						
							
							
								
								Show current quoted message above composition field  
							
							 
							
							... 
							
							
							
							Note that substantial changes will be required for the updated Android
mockups, putting the quotation into the text box next to the attachment
preview. 
							
						 
						
							8 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
								
								
							
							
								
							
								30957341e4 
								
									
								
							
								 
							
						 
						
							
							
								
								Show three dot icon next to message on hover  
							
							 
							
							... 
							
							
							
							But only if it doesn't have an error.
Also: reformatted message template in legacy_templates.js to match what
is in background.html for easier diffing. 
							
						 
						
							8 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
								
								
							
							
								
							
								1cc0633786 
								
									
								
							
								 
							
						 
						
							
							
								
								Full support for quotations in Android theme  
							
							 
							
							
							
						 
						
							8 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
								
								
							
							
								
							
								21bf02c94d 
								
									
								
							
								 
							
						 
						
							
							
								
								Fixed examples in Quote.md, rough Android visuals  
							
							 
							
							
							
						 
						
							8 years ago