Commit Graph

1238 Commits (b73e6035c14693a10fe7ffd8e1e93b7c0fb403b3)

Author SHA1 Message Date
sachaaaaa b73e6035c1
Merge pull request #541 from sachaaaaa/no_secondary_timeout
[multi-device] No secondary timeout
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
sachaaaaa f268fbb552
Merge pull request #534 from sachaaaaa/use_file_server_device_mapping
[multi-device] Use file server device mapping
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 cc04bee38a Start all the receivers only after the secondary registration is finished 6 years ago
sachaaaaa d8a45a901f lint 6 years ago
sachaaaaa a314721cce Both devices to update their mapping after secondary registration 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 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 b13a4f3e56
Merge pull request #520 from msgmaxim/mentions2
Custom message rendering of mentions
6 years ago
Maxim Shishmarev 16692696e0 address reviews 6 years ago
sachaaaaa 155a3b8f17
Merge pull request #512 from neuroscr/desktop-analytics
Desktop Analytics
6 years ago
Maxim Shishmarev 687e9db77b Custom message rendering of mentions 6 years ago
Ryan Tharp db8ac66118 fix method 6 years ago
Ryan Tharp 3150a6ce11 separate out new/open, more lint/cleanup 6 years ago
Ryan Tharp d4ca49ae95 separate out note to self 6 years ago
Maxim Shishmarev c54979bb41 Address review comments 6 years ago
Maxim Shishmarev 6c57346af0 Add missing file in tests 6 years ago
Maxim Shishmarev 1496a368e9 Add UI elements for searching and selecting members in a group chat 6 years ago
Ryan Tharp 88b44390bf Desktop Analytics 6 years ago
sachaaaaa fa6cde6cb9 use await/async 6 years ago
sachaaaaa 8ecf057386 Display list of paired device in modal 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 bd16bc5b9b lint 6 years ago
sachaaaaa 6de6b762e6 Ensure the latest contact signed prekey is used 6 years ago
sachaaaaa b10835ffc7 Share contact upon authorising secondary device 6 years ago
sachaaaaa cf3ddf0b03
Merge pull request #466 from sachaaaaa/mnemonic_secret
[multi-device] Show 3 last mnemonic representation of public key
6 years ago
Beaudan Brown 9beea2cbd3 Enforce curlies completely and lint with new settings 6 years ago
Beaudan Brown c4a95218fa Make even smaller 6 years ago
Beaudan Brown 3894f2784e Clean up redundant repetition 6 years ago
Beaudan Brown 66459ac4bd Remove most of the right click and cog menu options for the public chats 6 years ago
sachaaaaa ef6b22f6b9 Simplify and lint 6 years ago
sachaaaaa 35b6182074 Clean up after account registration failure 6 years ago
sachaaaaa e50a29ffa5 Show 3 last mnemonic representation of public key instead of public key during pairing 6 years ago
Beaudan Campbell-Brown 48b6bf54c1
Merge pull request #461 from Mikunj/qr-code
Pubkey QR code
6 years ago
Mikunj 58b0c5ef39 Removed a line 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 21dad58537 Linting. 6 years ago
Mikunj 831ae09576 Cherry pick "profile simplification" from Mik 6 years ago
Mikunj 3d179909c7 Decrease the correctness level on the QR code. 6 years ago
Mikunj 3380500a2d Added QR code viewing. 6 years ago
Beaudan Brown 351fa09ad6 Only show delete option if have mod status and show different modal for mod deletion 6 years ago
sachaaaaa 3a78f47cd7 Secondary device registration: UX changes (show countdown, disable button, etc.) 6 years ago
Mikunj c4dd10a5cd Simplified profile setting. Renamed functions to be less confusing. Removed storing profile in local storage. 6 years ago
sachaaaaa 661b207245 Various fixes for bugs introduced during reviews 6 years ago
sachaaaaa 06d60fd68e
Merge pull request #431 from sachaaaaa/secondary_device_registration_view
[multi-device] Secondary device registration UI
6 years ago
sachaaaaa 24cf1ef3f7
Merge pull request #433 from sachaaaaa/primary_accept_request
[multi-device] UI for accepting pairing request on Primary devices
6 years ago