Commit Graph

955 Commits (dc626ec4d03a1b0ca3f55cb74929199d2592e13b)

Author SHA1 Message Date
sachaaaaa dc626ec4d0 use primary device pubkey when setting nickname 6 years ago
Beaudan Campbell-Brown 8235662518
Merge pull request #589 from Mikunj/pairing-fix
Fix cross platform device linking
6 years ago
Mikunj 589b3f3233 Infer pairing message type from the content.
This should fix device pairing cross platform.
6 years ago
Beaudan Brown 883feb668d The rest of my multidevice work, send messages to all the correct devices and automatic friend request if not friends with a device 6 years ago
Beaudan Campbell-Brown aa66b28ffe
Merge pull request #579 from BeaudanBrown/friends-with-any
Add isFriendsWithAnyDevice and use it in relevant places
6 years ago
Beaudan Brown 76b36845bb Add isFriendsWithAnyDevice and use it in relevant places 6 years ago
Beaudan Brown 08ad913105 Add explicit isSecondary flag to conversation list items so they can remain hidden in the menu after they become friends etc 6 years ago
Beaudan Brown d97eced37b Merge branch 'clearnet' into multi-device 6 years ago
Beaudan Brown 638f1c0e6c Bringing together all the stuff for attachments and link previews 6 years ago
Beaudan Brown f0c198c7b7 Split uploadData to public and private 6 years ago
Beaudan Brown a1921cfff3 Enable link previews to be sent as attachments, might need some more tweaking 6 years ago
Beaudan Brown c7a91686a8 Update proto id and use the server id as the attachmentpointer id 6 years ago
Beaudan Brown 5710c1268c Revert id field and add new url field to be compatible with mobile 6 years ago
Beaudan Brown 4e85435bf7 Update attachment pipeline to upload and download from loki fileserver 6 years ago
sachaaaaa 73d90a5277
Merge pull request #537 from sachaaaaa/secondary_device_minimum_receiver
[multi-device] Start all the receivers only after the secondary registration is fini…
6 years ago
sachaaaaa c38e145be7 lint 6 years ago
sachaaaaa f268fbb552
Merge pull request #534 from sachaaaaa/use_file_server_device_mapping
[multi-device] Use file server device mapping
6 years ago
sachaaaaa cc04bee38a Start all the receivers only after the secondary registration is finished 6 years ago
sachaaaaa 91a79ea57c Fetch device mapping from server when after receiving friend request 6 years ago
sachaaaaa a314721cce Both devices to update their mapping after secondary registration 6 years ago
sachaaaaa 4929f8d8db Move high-level authorisation from message_receivier to libloki.crypto 6 years ago
sachaaaaa 77bfee8892 No need to handle authorisations sent in friend requests 6 years ago
sachaaaaa d5ddc1c536 No need to attach authorisation with every friend request 6 years ago
sachaaaaa b63d8ec84f Merge branch 'clearnet' into multi-device
* clearnet: (35 commits)
  yarn lint
  return early if signature is not a string
  lint pass 2
  lint pass 1
  make sure versioning on write can't get out of sync
  Update js/modules/loki_public_chat_api.js
  Handle annotations omit correctly
  fix typo CI found
  refactor
  pollOnceForMessages() move lastGot up, address Sacha's review
  Update js/modules/loki_public_chat_api.js
  address review
  address reviews
  Custom message rendering of mentions
  fix method
  separate out new/open, more lint/cleanup
  separate out note to self
  create window.mixpanel here
  use window.mixpanel, remove eventEmitter
  lint and remove unneeded params
  ...
6 years ago
Ryan Tharp c921d3e3b3 allow mixpanel to be already set up elsewhere 6 years ago
Ryan Tharp 88b44390bf Desktop Analytics 6 years ago
sachaaaaa d3653e8665 lint after manual merge 6 years ago
sachaaaaa 0426d85e7a Merge branch 'clearnet' into multi-device
* clearnet: (136 commits)
  Fix more check on deletion.
  Only shorten pubkeys if name is present
  Shorten pubkeys in quotations too
  better guard
  pass serverId back to the server
  Bump version.
  Purge cache on failure.
  Fix unnecessary link preview fetches.
  Review changes. Increase mod time to 30 seconds.
  Undo defaultPublicChatServer change,
  Modified colour of dark mod badge
  Linting.
  Updated design
  Show crown icon for moderators
  Fix last hash all being NULL in database
  Poll for moderators, store them on the conversation and use the list to determine our own mod status
  Make sure we are always updating the last deleted id
  Update ts/components/conversation/FriendRequest.md
  Fix #355 Display timestamp for friend requests
  Fix duplicate detection for sent messages in public chat
  ...

# Conflicts:
#	app/sql.js
#	js/background.js
#	js/models/messages.js
#	js/views/app_view.js
#	libloki/crypto.js
#	libtextsecure/message_receiver.js
6 years ago
sachaaaaa d17f86679f
Merge pull request #495 from sachaaaaa/fix_unknown_signedkey
[multi-device] Ensure the latest contact signed prekey is used
6 years ago
sachaaaaa 712afef8e2 simplify 6 years ago
sachaaaaa 6de6b762e6 Ensure the latest contact signed prekey is used 6 years ago
sachaaaaa cf0628a001 Secondary device to send friend request automatically to all sync contact received 6 years ago
sachaaaaa b10835ffc7 Share contact upon authorising secondary device 6 years ago
Beaudan Brown 9beea2cbd3 Enforce curlies completely and lint with new settings 6 years ago
Beaudan Campbell-Brown a6abcaf826
Merge pull request #453 from Mikunj/profile-simplification
Profile simplification
6 years ago
Beaudan Campbell-Brown 43bd167965
Merge pull request #463 from loki-project/public-chat
Public chat
6 years ago
Mikunj 831ae09576 Cherry pick "profile simplification" from Mik 6 years ago
sachaaaaa 1ea934d69c
Merge pull request #457 from sachaaaaa/share_profile_name
[multi-device] Share primary device profile name upon secondary registration
6 years ago
sachaaaaa 9f8ee875b7 address review 6 years ago
sachaaaaa 97970ff465 Share primary device profile name upon secondary registration 6 years ago
sachaaaaa 7b9e578d8a lint 6 years ago
sachaaaaa aa2438ad00 Shorter TTL for pairing requests 6 years ago
Mikunj c4dd10a5cd Simplified profile setting. Renamed functions to be less confusing. Removed storing profile in local storage. 6 years ago
Beaudan Brown 700ed5d2a8 Some refactoring from reviews, and include the token in the message pipeline instead of getting in message_api 6 years ago
Beaudan Brown b5fd01a468 Add required metadata to sending pipeline and send to public channels 6 years ago
sachaaaaa 1d4c98adf0
Merge pull request #444 from sachaaaaa/logic_fixes
[multi-device] Fix bugs revealed during reviews
6 years ago
Beaudan Brown eec4f22b50 Add crypto helpers and public error 6 years ago
sachaaaaa bb0150624f Address reviews 6 years ago
sachaaaaa 661b207245 Various fixes for bugs introduced during reviews 6 years ago
sachaaaaa 53b974d63f Send messages to every devices linked to a primary device 6 years ago