Commit Graph

697 Commits (21ea030f5a06672699f01f159a096886b5f52093)

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
6 years ago
Mikunj 3a8111020e Merge v1.23.0
# Conflicts:
#	background.html
#	package.json
#	yarn.lock
6 years ago
Mikunj 7387e88c97 Add showing friends in search. 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 57195017f9 Linting 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 22f7a352f9 updateLastMessage: If we don't update last text, clear it 6 years ago
Scott Nonnenberg 62de2a229d Add logging to track synchronization in message processing 6 years ago
Scott Nonnenberg 74cb808763 New MessageController as the single place for in-memory messages 6 years ago
Scott Nonnenberg 274949b247 Enable long message send as an attachment 6 years ago
Scott Nonnenberg 4d8fbe95ff Retry send: Always remove all errors and recalculate recipients 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 32fa5cccde Send sync sent messages properly in 1-member group 6 years ago
Scott Nonnenberg c76d537482 Note to Self: On just expire timer update, set TIMER_UPDATE flag 6 years ago
Scott Nonnenberg b3ac1373fa Move left pane entirely to React 6 years ago
Scott Nonnenberg 768007a269 Message Detail: Ensure that quotes are not clickable 6 years ago
Scott Nonnenberg 6ffbc0ac06 Archive Conversation 6 years ago
Scott Nonnenberg 812f895e12 Bring lastMessage and lastMessageStatus back to conversation 6 years ago
Scott Nonnenberg dcd16775c3 Note to Self: set expirationStartTimestamp before sending sync 6 years ago
Scott Nonnenberg eb7ad48951 Only put nbsp before last token in msg body if token is <12 chars 6 years ago
Beaudan 9717267b00 Review 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 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
sachaaaaa dca2462f6c
Merge pull request #248 from sachaaaaa/friend_request_expiry
Add requestExpired state to Friend Request state machine
6 years ago
sachaaaaa 77fb5b4a71 Missing closing parenthesis 6 years ago
Mikunj Varsani 353302ca16
Use Array.includes instead of Array.indexOf
Co-Authored-By: sachaaaaa <40749766+sachaaaaa@users.noreply.github.com>
6 years ago
sachaaaaa e953ae7be2 use correct function respondToAllFriendRequests 6 years ago
sachaaaaa 62889bbdd4 Add requestExpired state to Friend Request state machine 6 years ago
sachaaaaa 926c9ce3ca Fix multiple friend request timers instantiated 6 years ago
Mikunj 06be1da40d Added p2p message styling 6 years ago
Scott Nonnenberg 41ea9ee15b Ensure that we show error'd recipients in message details screen 6 years ago
Scott Nonnenberg ad53423e0a Queue quote reference handling per convo in handleDataMessage 6 years ago
Scott Nonnenberg af40ceda6c Note to Self timer fixes for bugs reported by beta users 6 years ago
Beaudan 4bb10044ea Clear timers after friend request complete and don't do timer related things if we are already friends 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 462fa712bc Show members: Pull conversation from group table 6 years ago
Scott Nonnenberg 12739ac82d Ensure we don't add empty attachments to quote 6 years ago
Beaudan 5d823de6f9 Renamed lokiSnodeAPI to start with lower case for consistency, refactor snode API to use conversation controller 6 years ago
Mikunj d30e950bf9 Changed hashing algorithm. 6 years ago
Mikunj a989a1a818 Save previews locally. 6 years ago
Mikunj 7564e270f8 Lint and code cleanup 6 years ago
Mikunj 27c6062351 Fix incoming messages not showing previews.
Linting.
6 years ago
Mikunj ae695fe32f Remove sending attachments. 6 years ago
Mikunj 8f8e25bb3e Added local link preview 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
Scott Nonnenberg 0d7480bd92 A number of small fixes for Link Previews 6 years ago