Commit Graph

11 Commits (0426d85e7aeaaee35245e1752ebbf3c78862b92d)

Author SHA1 Message Date
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
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 fc8aa0211d Addressing reviews 6 years ago
Beaudan Brown eec4f22b50 Add crypto helpers and public error 6 years ago
sachaaaaa a4411007b0 Pairing authorisations: refactor proto, change sql table, add getters 6 years ago
sachaaaaa d208614909 Multi-device part 1: make primary account generate and send authorisation to secondary 6 years ago
sachaaaaa 9d6c5bff36 make unverified https queries to the snodes 6 years ago
sachaaaaa aa722590fa use channel encryption with storage server 6 years ago
sachaaaaa e2abc0d510 Add channel encryption library with tests (not in used so far) 6 years ago
Mikunj 6bd2d3962e Linted files 6 years ago
Mikunj 982f10a505 Split libloki logic.
Added to gruntfile.
6 years ago