You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
session-desktop/ts/components/conversation
sachaaaaa 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
..
media-gallery
AddNewLines.md
AddNewLines.tsx
AttachmentList.md Improve caption editor usability, new 'add attachment' affordance 7 years ago
AttachmentList.tsx Improve caption editor usability, new 'add attachment' affordance 7 years ago
ContactDetail.md
ContactDetail.tsx
ContactName.md
ContactName.tsx Linted files 7 years ago
ConversationHeader.md
ConversationHeader.tsx Added online indicator to conversation header. 7 years ago
EmbeddedContact.md
EmbeddedContact.tsx
Emojify.md
Emojify.tsx Preserve links with embedded emoji 7 years ago
ExpireTimer.md
ExpireTimer.tsx
FriendRequest.md Linted files 7 years ago
FriendRequest.tsx Linted files 7 years ago
GroupNotification.md
GroupNotification.tsx
Image.md New staged attachments UI, multiple image attachments per message 7 years ago
Image.tsx Link Previews 7 years ago
ImageGrid.md Show just first image if we receive mixed multi-attachment msg 7 years ago
ImageGrid.tsx Link Previews 7 years ago
Linkify.md
Linkify.tsx
Message.md Link Previews 7 years ago
Message.tsx Link Previews 7 years ago
MessageBody.md Preserve links with embedded emoji 7 years ago
MessageBody.tsx Preserve links with embedded emoji 7 years ago
MessageDetail.md
MessageDetail.tsx
Quote.md
Quote.tsx Don't linkify quoted message contents 7 years ago
ResetSessionNotification.md
ResetSessionNotification.tsx Linted files 7 years ago
SafetyNumberNotification.md
SafetyNumberNotification.tsx
StagedGenericAttachment.md Some style and interaction fine-tuning 7 years ago
StagedGenericAttachment.tsx New staged attachments UI, multiple image attachments per message 7 years ago
StagedLinkPreview.md Link Previews 7 years ago
StagedLinkPreview.tsx Link Previews 7 years ago
StagedPlaceholderAttachment.md Improve caption editor usability, new 'add attachment' affordance 7 years ago
StagedPlaceholderAttachment.tsx Improve caption editor usability, new 'add attachment' affordance 7 years ago
TimerNotification.md
TimerNotification.tsx
Timestamp.md
Timestamp.tsx
TypingAnimation.md
TypingAnimation.tsx
TypingBubble.md Increase contrast of typing indicator in iOS theme 7 years ago
TypingBubble.tsx
VerificationNotification.md
VerificationNotification.tsx
types.ts