Commit Graph

1147 Commits (48c4ed1a295c393b0b969fa92c2eedf926e1ae15)

Author SHA1 Message Date
Mikunj 48c4ed1a29 Partial Merge commit 'bf904ddd129ceba8fa363ccf6d10ecd256c65f63' into signal-1.23
# Conflicts:
#	_locales/en/messages.json
#	app/sql.js
#	js/background.js
#	js/conversation_controller.js
#	js/models/conversations.js
#	js/views/inbox_view.js
#	main.js
6 years ago
Mikunj e343a04eea Merge commit '18b5b7c046436f2defab2e20407e22da180bf97b' into signal-1.22
# Conflicts:
#	app/sql.js
#	background.html
#	config/default.json
#	js/background.js
#	js/models/conversations.js
#	js/models/messages.js
#	js/modules/data.js
#	js/signal_protocol_store.js
#	js/views/conversation_search_view.js
#	libtextsecure/message_receiver.js
#	libtextsecure/sendmessage.js
#	main.js
#	package.json
#	preload.js
#	test/index.html
#	ts/components/Avatar.tsx
#	ts/components/conversation/ConversationHeader.md
#	ts/components/conversation/ConversationHeader.tsx
6 years ago
Mikunj 40ab727b12 Linting 6 years ago
Mikunj b2ecb87462 Review fixes 6 years ago
Mikunj c7130a3bbb Added password confirmation dialog before showing seeds. 6 years ago
Mikunj ae8b3899ad Changed registration to be a 2 step process. 6 years ago
Scott Nonnenberg bf904ddd12 On attachment save include date, include album index 6 years ago
Scott Nonnenberg e68367fe0d Remove reference to nonexistent view 6 years ago
Scott Nonnenberg 009c58749b Don't continue to log if socket is returning unknown status 6 years ago
Scott Nonnenberg 667b2e63f1 Ensure image lightbox is aware of its underlying message changes 6 years ago
Beaudan 9717267b00 Review 6 years ago
Beaudan 14367620d9 lint 6 years ago
Beaudan d0d57ea8c7 Add more functionality to the conversation right click menu, add right click for messages, change some of the ways toasts/confirmation dialogs are created, auto focus text input for nickname, clean up some stuff 6 years ago
Beaudan 5c29c6cb1d Search view now works with deleting contacts as well 6 years ago
Beaudan df93c97b48 Added ability to delete contacts and destroy all sessions with them. Added right click menu to contacts/conversations in list which can block, delete messages and delete contact 6 years ago
Beaudan f906cbfd50 Added enter to log in 6 years ago
Beaudan 5030ad4021 Made the slider label populate as well, plus removed redundant window function 6 years ago
Scott Nonnenberg 9afea3ae2b View All Media: Listen for updates to conversation, re-render 6 years ago
Scott Nonnenberg 1b9959aca3 Ensure outgoing attachment size always matches resized image 6 years ago
Scott Nonnenberg 5b54c9554e Remove groups table, conversation is single source of truth 6 years ago
Scott Nonnenberg 1d2c3ae23c Download attachments in separate queue from message processing 6 years ago
Scott Nonnenberg a43a78731a Note to Self 6 years ago
Scott Nonnenberg 858c7e629f Fine-tune linkification technique for link previews 6 years ago
Scott Nonnenberg 462fa712bc Show members: Pull conversation from group table 6 years ago
sachaaaaa 68fe552156 Merge commit '5c8558e293989094693f918a63b672301f1aeb55' into merge_1_21_1
* commit '5c8558e293989094693f918a63b672301f1aeb55':
  v1.21.1
  v1.21.1-beta.1
  Fix: Navigation to message via quote click didn't always work
  mainWindow.close - be ready for null mainWindow
  Ensure that Curve.async points to worker after startWorker call
  Protect against unhandled promises when calling checkForUpdates
  Reenable send when link preview is missing an image

# Conflicts:
#	package.json
6 years ago
Scott Nonnenberg 1a7df91dbc Fix: Navigation to message via quote click didn't always work 6 years ago
Mikunj a1e4b740f2 Fixed up settings view.
Fix review issues.
6 years ago
Mikunj 725a41a8d7 Added link preview setting. 6 years ago
sachaaaaa 0417f0ffad
Merge pull request #182 from sachaaaaa/disable_dragndro
Disable drag n drop temporarily
6 years ago
sachaaaaa 72b7f82522 Disable pasting files 6 years ago
sachaaaaa 46533fae0d disable drag n drop temporarily 6 years ago
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
sachaaaaa 432c336048
Merge pull request #171 from Mikunj/online-indicator-fix
Added online indicator to conversation header.
6 years ago
Mikunj ddfc99a461 Added online indicator to conversation header. 6 years ago
Beaudan 0c104e5a53 Small fix for the disconnected banner coming up when it shouldn't, just default to thinking we are connected and mock the onEmpty event. Will only get set to not connected if requests fail 6 years ago
Mikunj 9b382de6da Added online indicator.
Disable selection in contacts.
6 years ago
Scott Nonnenberg 374b9db493 Ensure that dialog pops up when permissions denied for voice note 6 years ago
Scott Nonnenberg 813924685e Link Previews 6 years ago
Scott Nonnenberg 0eb4760349 Show contact name on 'send anyway' dialog instead of $name$
Partial fix for #1914
6 years ago
Mikunj ac59e1249f Added db resetting.
Use built in signal warning view.
6 years ago
Mikunj e544cd4c88 Added confirmation dialog. 6 years ago
Mikunj 1a15ec9c15 Merge commit signal/master into signal-1.20 6 years ago
Scott Nonnenberg 0ba25ff8d5 Multiple images can now be selected in file chooser and drag/drop 6 years ago
Mikunj f92e8485f8 Merge development into lint
Added gitattributes
6 years ago
Scott Nonnenberg 1e4b562922 Multiple images can now be selected in file chooser and drag/drop 6 years ago
Beaudan Campbell-Brown ea1d007b4f
Merge pull request #136 from Mikunj/tests
Tests
6 years ago
Mikunj 6bd2d3962e Linted files 6 years ago
Mikunj feb8af476a Refactored BlockedNumberController. 6 years ago
Scott Nonnenberg 74bbdb88a5 Lint fixes 6 years ago
Scott Nonnenberg 16a821645f Preserve scroll position on toggle emoji panel, add attachment 6 years ago