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.

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		6 years ago
..
conversation	Merge branch 'textsecure/master' into merge_1_21_0	6 years ago
Avatar.md	Ensure that blue group avatars are preserved in dark theme	7 years ago
Avatar.tsx	Added online indicator to conversation header.	6 years ago
CaptionEditor.md	Improve caption editor usability, new 'add attachment' affordance	6 years ago
CaptionEditor.tsx	Improve caption editor usability, new 'add attachment' affordance	6 years ago
ContactListItem.md	ContactListItem: Add spacing above and below (for 'show members')	7 years ago
ContactListItem.tsx	Update to new design for avatars: individual/group icons/colors	7 years ago
ConversationListItem.md	Typing Indicators	7 years ago
ConversationListItem.tsx	Added online indicator to conversation header.	6 years ago
Intl.md	Finish new Message component, integrate into application	7 years ago
Intl.tsx	Finish new Message component, integrate into application	7 years ago
Lightbox.md	Support receiving multiple images in one messages	7 years ago
Lightbox.tsx	Ensure that multi-video lightbox scrolling changes video	7 years ago
LightboxGallery.md	Ensure that multi-video lightbox scrolling changes video	7 years ago
LightboxGallery.tsx	Support receiving multiple images in one messages	7 years ago
MainHeader.md	Add user's avatar to the top left of the screen	7 years ago
MainHeader.tsx	Linted files	6 years ago