Commit Graph

6045 Commits (7f433f3df0c309be3c1d561522d89069e9668fa4)
 

Author SHA1 Message Date
Ryan Tharp 7f433f3df0 move file server related functions into file server, make multidevice states global 6 years ago
Ryan Tharp 206d29b033 avoid no pubkey with guards, make sure primary and secondary authorization match 6 years ago
Ryan Tharp 9ba641c8c1 signature checking, hide your own message, addres potential race issues 6 years ago
Ryan Tharp 87474d48b5 fix async problem with receive forEach, implement most of the annotation processing for multidevice 6 years ago
Ryan Tharp 7b22806bf0 Merge branch 'multi-device' of https://github.com/loki-project/loki-messenger into multidevice-publicchat 6 years ago
Beaudan Campbell-Brown 64a77f9fba
Merge pull request #548 from sachaaaaa/various_fixes
[multi-device] Save device mappings upon accepting friend request + various fixes
6 years ago
sachaaaaa 53bdf14321 refactor 6 years ago
sachaaaaa 1f3311bc5d Save device mappings upon accepting friend request + various fixes 6 years ago
sachaaaaa 6415e33122
Merge pull request #543 from sachaaaaa/fix_update_mapping_after_init_api
[multi-device] Secondary device to update device mapping to server after lokiFileSer…
6 years ago
sachaaaaa c48f52b590
Merge pull request #542 from sachaaaaa/fix_secondary_sig_fileserver
[multi-device] Fix signatures being sent to file server as arraybuffer
6 years ago
sachaaaaa b73e6035c1
Merge pull request #541 from sachaaaaa/no_secondary_timeout
[multi-device] No secondary timeout
6 years ago
sachaaaaa b5924c5bad lint 6 years ago
sachaaaaa 48ce9a7649 lint 6 years ago
sachaaaaa cbee5a884c Secondary device to update device mapping to server after lokiFileServerAPI creation 6 years ago
sachaaaaa 03d0385427 Fix signatures being sent to file server as arraybuffer 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 c4728cf4f3 Provide a cancel button instead of a timeout for secondary registration 6 years ago
Ryan Tharp 468550cbdf getDeviceMappingForUsers() 6 years ago
Ryan Tharp ddde675ba8 stub out multidevice support, move token validation into server class 6 years ago
sachaaaaa c38e145be7 lint 6 years ago
sachaaaaa 8df692901a Merge branch 'clearnet' into multi-device
* clearnet:
  set active_at to now() for public channels
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 b53e9c4e05
Merge pull request #533 from sachaaaaa/fetch_mapping_during_friend_request
[multi-device] Fetch device mapping from server
6 years ago
sachaaaaa 52f103f3d3
Merge pull request #532 from sachaaaaa/reset_pairing_view
[multi-device] Reset pairing view after error
6 years ago
sachaaaaa 634d274ffc
Merge pull request #531 from sachaaaaa/remove_all_private_conv
[multi-device] Remove private convs only
6 years ago
sachaaaaa 2544507084
Merge pull request #530 from sachaaaaa/update_our_device_mapping
[multi-device] Add high-level function to update device mapping
6 years ago
sachaaaaa c3ee6240c2
Merge pull request #527 from sachaaaaa/default_active_at
set active_at to now() for public channels
6 years ago
sachaaaaa cc04bee38a Start all the receivers only after the secondary registration is finished 6 years ago
sachaaaaa d8a45a901f lint 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 5aa1af7ae8 Reset pairing view after error 6 years ago
sachaaaaa 8ce21b13fe Remove only private conversation during secondary registrations steps to keep public chats in db 6 years ago
sachaaaaa de6e4e4920 Add updateOurDeviceMapping that wraps setOurDeviceMapping 6 years ago
sachaaaaa 5a8ab00a96 Rename pairing getters to specify secondary or primary. Add getGrantAuthForPrimary. 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
sachaaaaa dc28ea3be3
Merge pull request #518 from sachaaaaa/PR_file_server
Add Annotation endpoint and LokiFileServerAPI
6 years ago
sachaaaaa 7d7eea9547 set active_at to now() for public channels 6 years ago
sachaaaaa 7549c45716 yarn lint 6 years ago
sachaaaaa a28c581666 return early if signature is not a string 6 years ago
sachaaaaa a931b2491a Merge branch 'clearnet' into PR_file_server
* clearnet:
  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 reviews
  Custom message rendering of mentions
  lint and remove unneeded params
  modernize annotations since we're making a backward-incomp change
  sign and only show verified messages

# Conflicts:
#	js/modules/loki_public_chat_api.js
6 years ago
sachaaaaa 035c48eb12
Merge pull request #517 from neuroscr/publicchat_signed
sign and only show verified public chat messages
6 years ago
Ryan Tharp 34b7117ff7
lint pass 2 6 years ago
Ryan Tharp 8bfb7f297d
lint pass 1 6 years ago
sachaaaaa b13a4f3e56
Merge pull request #520 from msgmaxim/mentions2
Custom message rendering of mentions
6 years ago
Ryan Tharp 6ac6d656a4
make sure versioning on write can't get out of sync 6 years ago
Ryan Tharp ab440a699f
Update js/modules/loki_public_chat_api.js
Co-Authored-By: sachaaaaa <40749766+sachaaaaa@users.noreply.github.com>
6 years ago