Commit Graph

933 Commits (b53e9c4e05ead1d584f6af16cbd3003fa2bc6516)

Author SHA1 Message Date
sachaaaaa 91a79ea57c Fetch device mapping from server when after receiving 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
sachaaaaa 5eab2098b6
Merge pull request #430 from sachaaaaa/handle_incoming_authorisation
[multi-device] Handle incoming pairing authorisation message
6 years ago
sachaaaaa 8ef54890b2
Update libtextsecure/message_receiver.js
Co-Authored-By: Mikunj Varsani <Mikunj@users.noreply.github.com>
6 years ago
sachaaaaa c7dc79e7f9 Fix missing awaits! 6 years ago
sachaaaaa 6ab05e28df Handle incoming pairing authorisation message 6 years ago
sachaaaaa 794e6416c8 Add requestPairing high-level function 6 years ago
Beaudan Brown 895cedc801 Lint 6 years ago
sachaaaaa 713e9a3acf Fix pubkey validation 6 years ago
Beaudan Brown 3f4b94ba74 Transition to initialising rss feeds in schema update 6 years ago
Ryan Tharp 48f2637ff9 lint 6 years ago
Ryan Tharp 0a1655b03d poll all feeds 6 years ago
Ryan Tharp c57571fdfd loki.network rss feed 6 years ago
sachaaaaa edd800d382 Make linter happy 6 years ago
sachaaaaa bf8bb23683 remove stale comment and simplify conversation creation 6 years ago
sachaaaaa d208614909 Multi-device part 1: make primary account generate and send authorisation to secondary 6 years ago
Beaudan f857744e88 Revert sending id 6 years ago
Beaudan f718bf15d2 Prepare to delete message, send message id to server 6 years ago
Beaudan 21f0149e22 Send profile and update it 6 years ago
Beaudan 014558d939 Squash and clean of old PRs, move towards sending cleartext again 6 years ago
sachaaaaa 0e61ab8ccc Better document magic numbers 6 years ago
sachaaaaa 16e51a2c7a use variable for magic number 6 years ago
sachaaaaa b15799e7cb Generate 13 word seeds by default - still accept 25 word seeds. 6 years ago
Beaudan 7dd155eb16 Remove empty event trigger, doesn't seem to be required any more but could be wrong 6 years ago