session-desktop/ts/components
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
2019-02-06 13:53:20 +11:00
..
conversation Merge branch 'textsecure/master' into merge_1_21_0 2019-02-06 13:53:20 +11:00
Avatar.md Ensure that blue group avatars are preserved in dark theme 2018-10-18 15:41:05 -07:00
Avatar.tsx Added online indicator to conversation header. 2019-02-05 14:22:55 +11:00
CaptionEditor.md Improve caption editor usability, new 'add attachment' affordance 2019-01-15 10:51:49 -08:00
CaptionEditor.tsx Improve caption editor usability, new 'add attachment' affordance 2019-01-15 10:51:49 -08:00
ContactListItem.md ContactListItem: Add spacing above and below (for 'show members') 2018-07-27 10:55:10 -07:00
ContactListItem.tsx Update to new design for avatars: individual/group icons/colors 2018-10-01 18:18:37 -07:00
ConversationListItem.md Typing Indicators 2018-11-26 15:26:04 -08:00
ConversationListItem.tsx Added online indicator to conversation header. 2019-02-05 14:22:55 +11:00
Intl.md Finish new Message component, integrate into application 2018-07-17 15:58:07 -07:00
Intl.tsx Finish new Message component, integrate into application 2018-07-17 15:58:07 -07:00
Lightbox.md Support receiving multiple images in one messages 2018-11-26 15:26:04 -08:00
Lightbox.tsx Ensure that multi-video lightbox scrolling changes video 2018-11-28 12:34:29 -08:00
LightboxGallery.md Ensure that multi-video lightbox scrolling changes video 2018-11-28 12:34:29 -08:00
LightboxGallery.tsx Support receiving multiple images in one messages 2018-11-26 15:26:04 -08:00
MainHeader.md Add user's avatar to the top left of the screen 2018-10-01 18:18:37 -07:00
MainHeader.tsx Linted files 2019-01-16 16:18:08 +11:00