Commit graph

19 commits

Author SHA1 Message Date
Mikunj 8808100796 Merge signal-1.24.0
# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	background.html
#	config/default.json
#	config/production.json
#	js/models/conversations.js
#	js/models/messages.js
#	js/views/conversation_view.js
#	js/views/inbox_view.js
#	js/views/settings_view.js
#	main.js
#	package.json
#	test/index.html
#	ts/components/conversation/ContactName.tsx
#	yarn.lock
2019-04-18 12:45:19 +10:00
Derek Meer 7727dc093e Hides the "Hide menu bar" option on MacOS (#2903)
The "Hide menu bar" option is only applicable to Windows and some Linux distros,
where the menu bar is attached to the Signal window. Therefore, this commit
ensures that it doesn't show up on MacOS. It includes a setting,
isHideMenuBarSupported(), to control the option's appearance. This
commit also includes the tests to make sure isHideMenuBarSupported()
works correctly.

Fixes #2705
2019-04-08 10:25:14 -07:00
Mikunj a1e4b740f2 Fixed up settings view.
Fix review issues.
2019-02-08 16:03:15 +11:00
Mikunj 725a41a8d7 Added link preview setting. 2019-02-08 14:58:31 +11:00
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
Scott Nonnenberg 813924685e Link Previews 2019-01-29 13:53:14 -08:00
Mikunj d626344ae1 Fix double quotes. 2019-01-14 15:45:23 +11:00
Mikunj 24455fc8b7 Updated TTL to use slider. 2019-01-14 12:41:25 +11:00
Mikunj 235dbb2176 Added display of message ttl in settings.
Fixed setting message ttl.
2019-01-14 09:46:31 +11:00
Beaudan bed9ce5be2 Added read receipt checkbox to the settings window which enables or disables the sending and receiving of read receipts 2018-11-22 16:49:15 +11:00
Mikunj a9c1f628a4 Switched to using html select. 2018-11-20 12:55:38 +11:00
Mikunj dbb92aa9c8 Added i18n messages. 2018-11-19 16:22:17 +11:00
Mikunj ba390e354b Added unblocking.
Added styling.

Trigger changes on both conversation and messages when we block/unblock.
2018-11-19 16:08:01 +11:00
Mikunj 658b2b0332 List blocked users in settings. 2018-11-19 15:07:17 +11:00
Mikunj a82999818a Added blocking/unblocking from friend request.
Fixed incoming messages being deleted.
2018-11-19 15:07:00 +11:00
vitya1 e3ddf280fe Link labels with checkboxes in settings pane (#2704) 2018-08-30 09:49:46 -07:00
Scott Nonnenberg c517e4193b New option: Disable spell check 2018-07-18 19:41:16 -07:00
Scott Nonnenberg fc5c52fbdf Remove iOS theme in favor of plain light/dark themes 2018-07-17 15:45:40 -07:00
Scott Nonnenberg ad4387803b New media permission, show dialog when not enabled for voice msg
UI now in separate renderer:
  - the permissions popup
  - settings dialog
  - debug log dialog
  - about window

Couple bug fixes:
  - About Window: Fix 'escape' to close window
  - Remove outdated dist/copy tasks from Gruntfile

Eslintified settings_view.js
2018-07-03 16:04:21 -07:00