Commit Graph

376 Commits (66459ac4bdc8154c152d7417477356f7acdda006)

Author SHA1 Message Date
Beaudan Brown 66459ac4bd Remove most of the right click and cog menu options for the public chats 6 years ago
Beaudan Brown 351fa09ad6 Only show delete option if have mod status and show different modal for mod deletion 6 years ago
Beaudan Brown 662c64f347 Remove ability to delete some rss conversations 6 years ago
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
6 years ago
Mikunj 3a8111020e Merge v1.23.0
# Conflicts:
#	background.html
#	package.json
#	yarn.lock
6 years ago
Mikunj 1f03e04d8c Merge commit 'c75a756b2a58bd4a79890e34673d95d9f17f3f01' into signal-1.23
# Conflicts:
#	js/views/conversation_view.js
#	package.json
#	ts/components/ConversationListItem.tsx
#	ts/components/conversation/ConversationHeader.tsx
6 years ago
Mikunj 12ce0140de Left pane changes.
Merge commit 'b3ac1373fa64117fe2a9ccfddf3712f1826c06d9' into signal-1.23

# Conflicts:
#	_locales/en/messages.json
#	background.html
#	js/background.js
#	js/conversation_controller.js
#	js/models/conversations.js
#	js/models/messages.js
#	js/views/conversation_list_item_view.js
#	js/views/conversation_list_view.js
#	js/views/conversation_search_view.js
#	js/views/inbox_view.js
#	libtextsecure/account_manager.js
#	package.json
#	stylesheets/_global.scss
#	stylesheets/_index.scss
#	stylesheets/_modules.scss
#	test/_test.js
#	test/index.html
#	test/models/conversations_test.js
#	test/views/conversation_search_view_test.js
#	ts/components/ConversationListItem.tsx
#	ts/components/MainHeader.tsx
#	ts/components/conversation/ConversationHeader.tsx
#	ts/components/conversation/ResetSessionNotification.tsx
6 years ago
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
Scott Nonnenberg b31fbcaa17 Don't send if message body is too long 6 years ago
Scott Nonnenberg 629dc8737b Fix issue where 'delete messages' was not clickable second time 6 years ago
Scott Nonnenberg 81de5f9a76 Introduce CTRL-E shortcut for archiving a conversation 6 years ago
Scott Nonnenberg 74cb808763 New MessageController as the single place for in-memory messages 6 years ago
Scott Nonnenberg b232d6289a Update react-contextmenu to avoid event handler issues un unload 6 years ago
Scott Nonnenberg 3b140d9b51 Update react-contextmenu to avoid event handler issues un unload 6 years ago
Scott Nonnenberg 8c4d90df07 Send long text as an attachment instead of inline
Remove Android length warning

Handle incoming long message attachments

Show long download pending status in message bubble

Fix the width of the smallest spinner

Remove Android length warning from HTML templates
6 years ago
Scott Nonnenberg b3ac1373fa Move left pane entirely to React 6 years ago
Scott Nonnenberg bf904ddd12 On attachment save include date, include album index 6 years ago
Scott Nonnenberg 6ffbc0ac06 Archive Conversation 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
Scott Nonnenberg 9afea3ae2b View All Media: Listen for updates to conversation, re-render 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 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
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
Mikunj ddfc99a461 Added online indicator to conversation header. 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 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
Scott Nonnenberg 1e4b562922 Multiple images can now be selected in file chooser and drag/drop 6 years ago
Mikunj 6bd2d3962e Linted files 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
Scott Nonnenberg 0de54e125c Improve caption editor usability, new 'add attachment' affordance 6 years ago
Scott Nonnenberg 7db7a3ad44 Preserve scroll position when adding/removing staged quote 6 years ago
Scott Nonnenberg b08c10a547 FileInputView: Event on attachment change to hide/show microphone 6 years ago
Scott Nonnenberg dc9f9dabfd Ensure that caption is shown even for single-image message 6 years ago
Scott Nonnenberg 985b1d6aa6 New staged attachments UI, multiple image attachments per message 6 years ago