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/app
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
..
.eslintrc.js Use window.log in browser context, turn on console eslint rule 7 years ago
attachment_channel.js Re-enable orphaned attachment cleanup 7 years ago
attachments.js Eliminate orphaned external message files on startup 7 years ago
auto_update.js When iOS device has been linked, use iOS color scheme 7 years ago
base_config.js Merge signal changes into branch. 7 years ago
config.js Let's make it all pretty, shall we? 7 years ago
ephemeral_config.js Merge signal changes into branch. 7 years ago
global_errors.js Show dialog if application fails to start up properly 6 years ago
locale.js Let's make it all pretty, shall we? 7 years ago
logging.js Let's make it all pretty, shall we? 7 years ago
menu.js Make all OS menus localizable 7 years ago
password_util.js Linted files 6 years ago
permissions.js Permissions: 'return callback(true)' instead of 'return true' 7 years ago
profile_images.js Linted files 6 years ago
protocol_filter.js Follow symlinks on target file path as well as user/config paths 7 years ago
sql.js Merge branch 'textsecure/master' into merge_1_21_0 6 years ago
sql_channel.js Split configuration into low and high traffic files 7 years ago
tray_icon.js Lint fixes after recent PRs 6 years ago
user_config.js Changed development folder to 'Loki-Messenger-Development` instead of 'Signal-Development' 6 years ago
window_state.js Clean logs on start - and eslint/mocha with code coverage (#1945) 7 years ago