Commit Graph

316 Commits (12f03f90f3a2c9339fb5d47846bed2ace0263776)

Author SHA1 Message Date
Ryan Tharp a0e7ba252c strip style and improving stripping regex 6 years ago
Ryan Tharp c57571fdfd loki.network rss feed 6 years ago
Beaudan fce4d0ce79 Review cleanup 6 years ago
Beaudan 86e55e5dc6 Clean up bold check 6 years ago
Beaudan 3ea3a394e7 Only bold the profile name for messages 6 years ago
Beaudan 958766dc65 Bold the profile name and truncate the pubkey 6 years ago
Beaudan 3a5e6e2fd3 Lint 6 years ago
Beaudan 1fc2173d9b Update header template to display group names properly and update migration to only store name for public chat 6 years ago
Beaudan 1d0067e6e5 Forgot to add this part 6 years ago
Maxim Shishmarev d0e73ed7f8 Add a button to paste pubkey from clipboard if valid 6 years ago
Beaudan 47ac247f83 Comment out the show all media button 6 years ago
Mikunj b8ef6c2cc6 Loki changes
Added friends section in search.

This is because contacts is now used in signal for something else and we don't want to clash meanings.

Styling fixes

Add dropdown options into mainheader

Updated styling

Restore StartNewConversation to the old ui style of loki messenger.

Fix friend search display.

Fix header expand animation.

Hooked up menu actions.

Linting.

More styling changes.

Fix tests.

Added back in the loki logo below the gutter.

Fix toast positioning.

Fix context menu showing incorrectly on virtual lists.

Added tabs.

Linting
6 years ago
Mikunj 3152f92e30 Merge signal 1.23.2
# Conflicts:
#	app/sql.js
#	js/conversation_controller.js
#	package.json
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 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 8833cd7de4 Skip URLs that include the @ symbol when generating links
Thanks to mcsim for the bug report.
6 years ago
Scott Nonnenberg 230c6dc284 Fix vertical sizing of left pane when switching inbox<->archive 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 d72f89d776 Render only visible conversations in left pane 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 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 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 0de54e125c Improve caption editor usability, new 'add attachment' affordance 6 years ago
Scott Nonnenberg cba47668cd Increase contrast of typing indicator in iOS theme 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 6eb8f5680c Preserve links with embedded emoji 6 years ago
Scott Nonnenberg 985b1d6aa6 New staged attachments UI, multiple image attachments per message 6 years ago
Mikunj f3367465d8 Fix menu items not triggering after conversation is removed and then added. 6 years ago
sachaaaaa 27674513ba
Merge branch 'development' into signal-v1.19 6 years ago
Mikunj a2f12ca18e Added option to copy conversation public key. 6 years ago
Mikunj 654b0dac84 Merge signal-master. 6 years ago
sachaaaaa 7e612700f7 Handle session reset, Loki style 6 years ago
Mikunj 341c5e4ed8 Updated nickname display modal. 6 years ago
Mikunj 51e8bc40b6 Show public key tooltip when you hover over profile text. 6 years ago
Mikunj 14ecbc3f35 Moved MainHeader into its own Backbone View. 6 years ago
Mikunj a807b6eacd Show expand icon on main header. 6 years ago
Mikunj cb3599eea8 Removed IdentityKeyHeader. 6 years ago
Mikunj 1be63b52b2 Show contact name on main header. 6 years ago
Scott Nonnenberg f5954db711 Ensure that multi-video lightbox scrolling changes video 7 years ago
Mikunj ac4e04912c Minor language fixes. 7 years ago
Mikunj 98c4b5d77b Added editing own nickname.
Fix dark theme support.
Fix notification titles.
7 years ago
Mikunj 449f44cc5a Added changing user nicknames. 7 years ago
Mikunj f1d18219ed Conversation UI update. 7 years ago
Scott Nonnenberg 79a861a870 Typing Indicators 7 years ago
Scott Nonnenberg 99252702e1 Support receiving multiple images in one messages 7 years ago
sachaaaaa dbdd52b4eb
Merge pull request #50 from Mikunj/fix/friend-request
Friend request fixes
7 years ago
Mikunj 484efd34a3 Added friend request message expiration. 7 years ago
Mikunj a82999818a Added blocking/unblocking from friend request.
Fixed incoming messages being deleted.
7 years ago
Mikunj ae2e2fa2ae Updated UI in conversation to support user blocking behaviour. 7 years ago
Mikunj 557fed11f3 Only display retry send button if the request is pending. 7 years ago
Mikunj 4d08a74d53 Updated FriendRequest to be more consistent with the other typescript components. 7 years ago
Mikunj f45e0030c4 Added status display and retry send to friend request. 7 years ago
Mikunj fc3cb9c46d Replace old pending messages with new one when adding a new incoming friend request.
More refactoring.
7 years ago
Mikunj a80d6bb868 Merged branch correctly. 7 years ago
Mikunj 0a23888875 Fix up friend request message layout 7 years ago
Mikunj 0cf616328e Fixed saving prekey bundle once friend request is accepted.
Added option to delete conversation after it is declined.
7 years ago
Mikunj c150cbe34f Friend request message indicator. 7 years ago
Mikunj 9dc19044b9 Handle the case where the user is sending a friend request.
Fix up styling for outgoing message.
7 years ago
Mikunj 08ca779fe1 Fixed up friend request message display 7 years ago
Mikunj 5626cfe47d Added FriendRequest message 7 years ago
Mikunj f589fdac5c Merge signal changes into branch. 7 years ago
sachaaaaa 4b9fcb98d4 Linting and other housekeeping stuff 7 years ago
Scott Nonnenberg a7d78c0e9b Sealed Sender support
https://signal.org/blog/sealed-sender/
7 years ago
Scott Nonnenberg 7789beec64 Calculate warning properly for all methods of attachment download 7 years ago
sachaaaaa 639c3e9a4f fix app name from previous merge 7 years ago
sachaaaaa 9370e2b74a Merge branch 'master' of https://github.com/signalapp/Signal-Desktop into development
* 'master' of https://github.com/signalapp/Signal-Desktop: (38 commits)
  v1.17.0
  v1.17.0-beta.4
  Ensure that blue group avatars are preserved in dark theme
  Android theme: Incoming quotes take color from containing message
  Conversations have blue avatar backgrounds if no image provided
  Fix lint errors
  Add ca language
  inboxView: Ensure Conversation exists for our own number
  Ensure that file is not attached if we've filtered it
  v1.17.0-beta.3
  Localization updates
  v1.16.3
  Lint fixes
  Lint fixes
  Better handle large numbers of messages in cache on startup
  Keep object stores after conversations migrate to SQLCipher
  Longer timeout for orphaned file cleanup
  Tests and increase consistency for isFileDangerous calls
  Longer timeout for orphaned file cleanup
  v1.17.0-beta.2
  ...

# Conflicts:
#	background.html
#	package.json
7 years ago
Scott Nonnenberg 2b5f6d8b5e Ensure that blue group avatars are preserved in dark theme 7 years ago
Scott Nonnenberg fbaef50c4a Android theme: Incoming quotes take color from containing message 7 years ago
Scott Nonnenberg f21f83a163 Conversations have blue avatar backgrounds if no image provided 7 years ago
Scott Nonnenberg bc0ec92ad2 Tests and increase consistency for isFileDangerous calls 7 years ago
Scott Nonnenberg 0850dc368a Lint fixes 7 years ago
Scott Nonnenberg 7d9711ba65 Restore iOS-specific theme; colors on left in android theme 7 years ago
Scott Nonnenberg ca61c9cb85 Warnings for dangerous files 7 years ago
Scott Nonnenberg a8e12d0771 Add user's avatar to the top left of the screen 7 years ago
Scott Nonnenberg 8f3e3b7aaf Update to new design for avatars: individual/group icons/colors
And two initials.
7 years ago
Scott Nonnenberg cf16ced91c Unread badge is now attached to avatar in left pane 7 years ago
Scott Nonnenberg 10c53bddb0 Move to new colors, switch incoming/outgoing colors 7 years ago