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/js
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
..
models Merge branch 'textsecure/master' into merge_1_21_0 7 years ago
modules Merge branch 'textsecure/master' into merge_1_21_0 7 years ago
views Merge branch 'textsecure/master' into merge_1_21_0 7 years ago
.eslintrc
Mp3LameEncoder.min.js
WebAudioRecorderMp3.js
about_start.js
background.js Merge branch 'textsecure/master' into merge_1_21_0 7 years ago
blocked_number_controller.js Merge development into lint 7 years ago
chromium.js
conversation_controller.js Review fixes. 7 years ago
database.js Merge branch 'master' of https://github.com/signalapp/Signal-Desktop into development 7 years ago
debug_log_start.js
delivery_receipts.js Move conversations to SQLCipher 7 years ago
expire.js
expiring_messages.js
focus_listener.js
job_queue.js Rename queue_manager to job_queue 7 years ago
keychange_listener.js Move conversations to SQLCipher 7 years ago
legacy_storage.js Merge signal changes into branch. 7 years ago
libphonenumber-util.js
libsignal-protocol-worker.js Merge signal changes into branch. 7 years ago
logging.js Linted files 7 years ago
notifications.js Linted files 7 years ago
password_start.js Rename launcherView to passwordView. 7 years ago
permissions_popup_start.js
read_receipts.js Move conversations to SQLCipher 7 years ago
read_syncs.js
registration.js
reliable_trigger.js
rotate_signed_prekey_listener.js
settings_start.js Merge branch 'textsecure/master' into merge_1_21_0 7 years ago
signal_protocol_store.js Merge development into lint 7 years ago
spell_check.js
storage.js Merge signal changes into branch. 7 years ago
util_worker_tasks.js Linted files 7 years ago
wall_clock_listener.js