e64ccbdd2b 
								
							
								 
							
						 
						
							
							
								
								Clean up RSS conversation  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9e6f6d5a01 
								
							
								 
							
						 
						
							
							
								
								Fix incorrectly showing friend request as pending  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								16692696e0 
								
							
								 
							
						 
						
							
							
								
								address reviews  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								687e9db77b 
								
							
								 
							
						 
						
							
							
								
								Custom message rendering of mentions  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								1496a368e9 
								
							
								 
							
						 
						
							
							
								
								Add UI elements for searching and selecting members in a group chat  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0d9e4bbf45 
								
							
								 
							
						 
						
							
							
								
								Only shorten pubkeys if name is present  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								08cab426c5 
								
							
								 
							
						 
						
							
							
								
								Shorten pubkeys in quotations too  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0b898612d9 
								
							
								 
							
						 
						
							
							
								
								Linting.  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0883b1b650 
								
							
								 
							
						 
						
							
							
								
								Updated styles.  
							
							... 
							
							
							
							Merge commit clearnet into mod-badges 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e9a2b57d37 
								
							
								 
							
						 
						
							
							
								
								Show crown icon for moderators  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								72b3d02b52 
								
							
								 
							
						 
						
							
							
								
								Poll for moderators, store them on the conversation and use the list to determine our own mod status  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								700c835782 
								
							
								 
							
						 
						
							
							
								
								Update ts/components/conversation/FriendRequest.md  
							
							... 
							
							
							
							Co-Authored-By: Mikunj Varsani <Mikunj@users.noreply.github.com> 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e5eab74b1b 
								
							
								 
							
						 
						
							
							
								
								Fix   #355  Display timestamp for friend requests  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								a2cda31f1a 
								
							
								 
							
						 
						
							
							
								
								Remove delete option from more info  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								616e952f8e 
								
							
								 
							
						 
						
							
							
								
								Add right click option to public chat messages to copy pubkey of sender  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f4e76f0576 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #455  from neuroscr/public-delete  
							
							... 
							
							
							
							Public delete 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								ba72f55b03 
								
							
								 
							
						 
						
							
							
								
								Fix missing react key error  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								351fa09ad6 
								
							
								 
							
						 
						
							
							
								
								Only show delete option if have mod status and show different modal for mod deletion  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e4ecc5b389 
								
							
								 
							
						 
						
							
							
								
								A prepare for message deletion  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								662c64f347 
								
							
								 
							
						 
						
							
							
								
								Remove ability to delete some rss conversations  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9bd6b7a364 
								
							
								 
							
						 
						
							
							
								
								lint  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a0e7ba252c 
								
							
								 
							
						 
						
							
							
								
								strip style and improving stripping regex  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								c57571fdfd 
								
							
								 
							
						 
						
							
							
								
								loki.network rss feed  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								fce4d0ce79 
								
							
								 
							
						 
						
							
							
								
								Review cleanup  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								86e55e5dc6 
								
							
								 
							
						 
						
							
							
								
								Clean up bold check  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3ea3a394e7 
								
							
								 
							
						 
						
							
							
								
								Only bold the profile name for messages  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								958766dc65 
								
							
								 
							
						 
						
							
							
								
								Bold the profile name and truncate the pubkey  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								1d0067e6e5 
								
							
								 
							
						 
						
							
							
								
								Forgot to add this part  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								47ac247f83 
								
							
								 
							
						 
						
							
							
								
								Comment out the show all media button  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								b8ef6c2cc6 
								
							
								 
							
						 
						
							
							
								
								Loki changes  
							
							... 
							
							
							
							Added friends section in search.
This is because contacts is now used in signal for something else and we don't want to clash meanings.
Styling fixes
Add dropdown options into mainheader
Updated styling
Restore StartNewConversation to the old ui style of loki messenger.
Fix friend search display.
Fix header expand animation.
Hooked up menu actions.
Linting.
More styling changes.
Fix tests.
Added back in the loki logo below the gutter.
Fix toast positioning.
Fix context menu showing incorrectly on virtual lists.
Added tabs.
Linting 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								3152f92e30 
								
							
								 
							
						 
						
							
							
								
								Merge signal 1.23.2  
							
							... 
							
							
							
							# Conflicts:
#	app/sql.js
#	js/conversation_controller.js
#	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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								8833cd7de4 
								
							
								 
							
						 
						
							
							
								
								Skip URLs that include the @ symbol when generating links  
							
							... 
							
							
							
							Thanks to mcsim for the bug report. 
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								6ffbc0ac06 
								
							
								 
							
						 
						
							
							
								
								Archive Conversation  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ae2db9f09a 
								
							
								 
							
						 
						
							
							
								
								Improve handling for URLs composed of mixed character sets  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								14367620d9 
								
							
								 
							
						 
						
							
							
								
								lint  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								9ac76e7e62 
								
							
								 
							
						 
						
							
							
								
								Linting  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								06be1da40d 
								
							
								 
							
						 
						
							
							
								
								Added p2p message styling  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								9c540ab977 
								
							
								 
							
						 
						
							
							
								
								Add cache support to Signal Protocol Store  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1d2c3ae23c 
								
							
								 
							
						 
						
							
							
								
								Download attachments in separate queue from message processing  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a43a78731a 
								
							
								 
							
						 
						
							
							
								
								Note to Self  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a0f67c22da 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'textsecure/master' into merge_1_21_0  
							
							... 
							
							
							
							* textsecure/master: (26 commits)
  v1.21.0
  v1.21.0-beta.4
  Dark Theme: Preserve blue background on app loading screen
  Localization updates
  Fix width of audio player when window is very narrow
  A number of small fixes for Link Previews
  Get rid of the white flash when the app starts up (#3083 )
  v1.21.0-beta.3
  Lint fixes
  Introduce new language: NB
  Fail over to all numbers in retry if errors don't have numbers
  Use the proper method for pulling attachments off disk for retry
  Fix rendering bug with verified state in updateVerified()
  Update electron-builder and electron-updater
  Ensure that dialog pops up when permissions denied for voice note
  Lint fixes
  Large update to localization strings
  Link Previews
  Ensure that blocked messages are dropped even after sealed sender
  Don't linkify quoted message contents
  ...
# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	_locales/cs/messages.json
#	background.html
#	config/default.json
#	index.html
#	js/models/conversations.js
#	js/modules/web_api.js
#	js/settings_start.js
#	js/views/conversation_view.js
#	js/views/settings_view.js
#	package.json
#	protos/SignalService.proto
#	stylesheets/_index.scss
#	stylesheets/_settings.scss 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ddfc99a461 
								
							
								 
							
						 
						
							
							
								
								Added online indicator to conversation header.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								813924685e 
								
							
								 
							
						 
						
							
							
								
								Link Previews  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								51f1ef5725 
								
							
								 
							
						 
						
							
							
								
								Don't linkify quoted message contents  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1a15ec9c15 
								
							
								 
							
						 
						
							
							
								
								Merge commit signal/master into signal-1.20  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								6bd2d3962e 
								
							
								 
							
						 
						
							
							
								
								Linted files  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								0de54e125c 
								
							
								 
							
						 
						
							
							
								
								Improve caption editor usability, new 'add attachment' affordance  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								cba47668cd 
								
							
								 
							
						 
						
							
							
								
								Increase contrast of typing indicator in iOS theme  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								aab2a57b48 
								
							
								 
							
						 
						
							
							
								
								Some style and interaction fine-tuning  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a900792a06 
								
							
								 
							
						 
						
							
							
								
								Use thumbnails for smaller cells in image grids  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ba711d8985 
								
							
								 
							
						 
						
							
							
								
								Show just first image if we receive mixed multi-attachment msg  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								52d3138958 
								
							
								 
							
						 
						
							
							
								
								Caption editor: add keyboard interaction, disable for single img  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								6eb8f5680c 
								
							
								 
							
						 
						
							
							
								
								Preserve links with embedded emoji  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								985b1d6aa6 
								
							
								 
							
						 
						
							
							
								
								New staged attachments UI, multiple image attachments per message  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f3367465d8 
								
							
								 
							
						 
						
							
							
								
								Fix menu items not triggering after conversation is removed and then added.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								27674513ba 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'development' into signal-v1.19  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a2f12ca18e 
								
							
								 
							
						 
						
							
							
								
								Added option to copy conversation public key.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								654b0dac84 
								
							
								 
							
						 
						
							
							
								
								Merge signal-master.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								7e612700f7 
								
							
								 
							
						 
						
							
							
								
								Handle session reset, Loki style  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								341c5e4ed8 
								
							
								 
							
						 
						
							
							
								
								Updated nickname display modal.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								51e8bc40b6 
								
							
								 
							
						 
						
							
							
								
								Show public key tooltip when you hover over profile text.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								449f44cc5a 
								
							
								 
							
						 
						
							
							
								
								Added changing user nicknames.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f1d18219ed 
								
							
								 
							
						 
						
							
							
								
								Conversation UI update.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								79a861a870 
								
							
								 
							
						 
						
							
							
								
								Typing Indicators  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								99252702e1 
								
							
								 
							
						 
						
							
							
								
								Support receiving multiple images in one messages  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								dbdd52b4eb 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #50  from Mikunj/fix/friend-request  
							
							... 
							
							
							
							Friend request fixes 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								484efd34a3 
								
							
								 
							
						 
						
							
							
								
								Added friend request message expiration.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a82999818a 
								
							
								 
							
						 
						
							
							
								
								Added blocking/unblocking from friend request.  
							
							... 
							
							
							
							Fixed incoming messages being deleted. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ae2e2fa2ae 
								
							
								 
							
						 
						
							
							
								
								Updated UI in conversation to support user blocking behaviour.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								557fed11f3 
								
							
								 
							
						 
						
							
							
								
								Only display retry send button if the request is pending.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								4d08a74d53 
								
							
								 
							
						 
						
							
							
								
								Updated FriendRequest to be more consistent with the other typescript components.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f45e0030c4 
								
							
								 
							
						 
						
							
							
								
								Added status display and retry send to friend request.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								fc3cb9c46d 
								
							
								 
							
						 
						
							
							
								
								Replace old pending messages with new one when adding a new incoming friend request.  
							
							... 
							
							
							
							More refactoring. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a80d6bb868 
								
							
								 
							
						 
						
							
							
								
								Merged branch correctly.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								0a23888875 
								
							
								 
							
						 
						
							
							
								
								Fix up friend request message layout  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								0cf616328e 
								
							
								 
							
						 
						
							
							
								
								Fixed saving prekey bundle once friend request is accepted.  
							
							... 
							
							
							
							Added option to delete conversation after it is declined. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								9dc19044b9 
								
							
								 
							
						 
						
							
							
								
								Handle the case where the user is sending a friend request.  
							
							... 
							
							
							
							Fix up styling for outgoing message. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								08ca779fe1 
								
							
								 
							
						 
						
							
							
								
								Fixed up friend request message display  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								5626cfe47d 
								
							
								 
							
						 
						
							
							
								
								Added FriendRequest message  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f589fdac5c 
								
							
								 
							
						 
						
							
							
								
								Merge signal changes into branch.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								4b9fcb98d4 
								
							
								 
							
						 
						
							
							
								
								Linting and other housekeeping stuff  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a7d78c0e9b 
								
							
								 
							
						 
						
							
							
								
								Sealed Sender support  
							
							... 
							
							
							
							https://signal.org/blog/sealed-sender/  
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								7789beec64 
								
							
								 
							
						 
						
							
							
								
								Calculate warning properly for all methods of attachment download  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								fbaef50c4a 
								
							
								 
							
						 
						
							
							
								
								Android theme: Incoming quotes take color from containing message  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								bc0ec92ad2 
								
							
								 
							
						 
						
							
							
								
								Tests and increase consistency for isFileDangerous calls  
							
							
							
						 
						
							7 years ago