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 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
..
_conversation.scss	Warnings for dangerous files	7 years ago
_debugLog.scss	Prettier: Format all stylesheets	7 years ago
_emoji.scss	Style scrollbar	7 years ago
_global.scss	Add user's avatar to the top left of the screen	7 years ago
_index.scss	Merge branch 'master' of https://github.com/signalapp/Signal-Desktop into development	7 years ago
_ios.scss	Restore iOS-specific theme; colors on left in android theme	7 years ago
_lightbox.scss	Finish new Message component, integrate into application	7 years ago
_mixins.scss	Finish new Message component, integrate into application	7 years ago
_modal.scss	Finish new Message component, integrate into application	7 years ago
_modules.scss	Conversations have blue avatar backgrounds if no image provided	7 years ago
_options.scss	New React component: Message	7 years ago
_progress.scss	Prettier: Format all stylesheets	7 years ago
_recorder.scss	Finish new Message component, integrate into application	7 years ago
_settings.scss	New media permission, show dialog when not enabled for voice msg	7 years ago
_theme_dark.scss	Ensure that blue group avatars are preserved in dark theme	7 years ago
_variables.scss	Restore iOS-specific theme; colors on left in android theme	7 years ago
manifest.scss	Restore iOS-specific theme; colors on left in android theme	7 years ago