Commit Graph

371 Commits (ef670bec3f74744711b98753bd8e794915f1db3a)

Author SHA1 Message Date
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 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 768007a269 Message Detail: Ensure that quotes are not clickable 6 years ago
Scott Nonnenberg e980e3cd22 Lint fixes 6 years ago
Scott Nonnenberg 6ffbc0ac06 Archive Conversation 6 years ago
Scott Nonnenberg d72f89d776 Render only visible conversations in left pane 6 years ago
Scott Nonnenberg 031b64a476 Disable full-text search until we can go to arbitrary messages 6 years ago
Scott Nonnenberg ae161c6cf6 Update to Electron 4.x 6 years ago
Scott Nonnenberg ae2db9f09a Improve handling for URLs composed of mixed character sets 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 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
Mikunj 9ac76e7e62 Linting 6 years ago
Mikunj 06be1da40d Added p2p message styling 6 years ago
Scott Nonnenberg d574c2a1e4 Lint fixes 6 years ago
Scott Nonnenberg ca0c0133e9 Lint fixes 6 years ago
Scott Nonnenberg e12e120355 Lint fixes 6 years ago
Scott Nonnenberg 3f8223ff48 Revert electron-builder upgrade due to bugs
This reverts commit 8a3acc6b7e
6 years ago
Scott Nonnenberg 9c540ab977 Add cache support to Signal Protocol Store 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
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
Mikunj 9b382de6da Added online indicator.
Disable selection in contacts.
6 years ago
Scott Nonnenberg 4d69e109b8 Lint fixes 6 years ago
Scott Nonnenberg 1533fcc807 Fail over to all numbers in retry if errors don't have numbers 6 years ago
Scott Nonnenberg 8a3acc6b7e Update electron-builder and electron-updater 6 years ago
Scott Nonnenberg 589a66c78c Lint fixes 6 years ago
Scott Nonnenberg 813924685e Link Previews 6 years ago
Scott Nonnenberg 51f1ef5725 Don't linkify quoted message contents 6 years ago
Mikunj 1a15ec9c15 Merge commit signal/master into signal-1.20 6 years ago
Mikunj 6bd2d3962e Linted files 6 years ago
Scott Nonnenberg 74bbdb88a5 Lint fixes 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
Beaudan 6863f7e51a Small fix for strange bug where timezone would be different in the past for regular user vs sudo 6 years ago
Scott Nonnenberg cba47668cd Increase contrast of typing indicator in iOS theme 6 years ago
Scott Nonnenberg 57abb8300f Upgrade Electron to 3.0.14 6 years ago
Scott Nonnenberg aab2a57b48 Some style and interaction fine-tuning 6 years ago
Scott Nonnenberg a900792a06 Use thumbnails for smaller cells in image grids 6 years ago
Scott Nonnenberg ba711d8985 Show just first image if we receive mixed multi-attachment msg 6 years ago
Scott Nonnenberg 52d3138958 Caption editor: add keyboard interaction, disable for single img 6 years ago
Scott Nonnenberg b08c10a547 FileInputView: Event on attachment change to hide/show microphone 6 years ago
Scott Nonnenberg 6eb8f5680c Preserve links with embedded emoji 6 years ago