Commit Graph

6120 Commits (cd2c4b993ae38c7c1f016fb41c18a0930a333474)
 

Author SHA1 Message Date
sachaaaaa 33ea259d45 Rename file 6 years ago
sachaaaaa fc00373897 Change LokiPublicChatAPI to LokiAppDotNetAPI, add annotations getter and setter 6 years ago
Ryan Tharp a97788c7d9 modernize annotations since we're making a backward-incomp change 6 years ago
Ryan Tharp a0b52826e9 sign and only show verified messages 6 years ago
Ryan Tharp c921d3e3b3 allow mixpanel to be already set up elsewhere 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 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 7ff32258f0
Merge pull request #499 from sachaaaaa/auto_friend_secondary
[multi-device] Auto friend request to sync contacts
6 years ago
sachaaaaa 44da907fb7
Merge pull request #501 from sachaaaaa/search_returns_primary_device
[multi-device] Search returns primary device conversation
6 years ago
Mikunj 75a527e828 Replaced value with a descriptive constant. 6 years ago
Mikunj 001d882273 Add comment to fix up confusion. 6 years ago
sachaaaaa bd16bc5b9b lint 6 years ago
sachaaaaa 6de6b762e6 Ensure the latest contact signed prekey is used 6 years ago
Mikunj 19b0dabe11 Keep a cache of the last 5 fetched messages for public chat so we can use it to detect duplicate messages. 6 years ago
Mikunj 3152637cdc Fix more check on deletion. 6 years ago
Mikunj Varsani 69eab9f196
Merge pull request #503 from msgmaxim/shorten_pubkey
Shorten pubkeys in quotations too
6 years ago
Maxim Shishmarev 0d9e4bbf45 Only shorten pubkeys if name is present 6 years ago
Ryan Tharp 59609a13f9
Merge pull request #502 from neuroscr/clearnet
pass serverId back to the server
6 years ago
Maxim Shishmarev 08cab426c5 Shorten pubkeys in quotations too 6 years ago
Ryan Tharp ca5275b410 better guard 6 years ago
Ryan Tharp e6d22aab19 pass serverId back to the server 6 years ago
sachaaaaa d3c3184405 Search returns primary device when looking up secondary pub key 6 years ago
Mikunj 530a9201a2 Bump version. 6 years ago
Mikunj Varsani ec790ddf89
Merge pull request #500 from Mikunj/link-preview-fix
Fix unnecessary link preview fetches.
6 years ago
Mikunj a9710a68db Purge cache on failure. 6 years ago
Mikunj Varsani 51f161a613
Merge pull request #498 from Mikunj/mod-badges
Mod badges
6 years ago
Mikunj Varsani d302004225
Merge pull request #493 from BeaudanBrown/delete-polling-fix
Make sure we are always updating the last deleted id
6 years ago
Mikunj Varsani 0acea50acb
Merge pull request #490 from BeaudanBrown/incoming-public
Fix duplicate detection for sent messages in public chat
6 years ago
Mikunj 0636e635d5 Fix unnecessary link preview fetches. 6 years ago
sachaaaaa f9df221638
Merge pull request #497 from sachaaaaa/prevent_multiple_retrievers
[multi-device] Ensure API objects are inited only once
6 years ago
sachaaaaa cf0628a001 Secondary device to send friend request automatically to all sync contact received 6 years ago
Mikunj e6d62cb22c Review changes.
Increase mod time to 30 seconds.
6 years ago
Mikunj c69bd81343 Undo defaultPublicChatServer change, 6 years ago
Mikunj f860076587 Modified colour of dark mod badge 6 years ago
Mikunj 0b898612d9 Linting. 6 years ago
sachaaaaa a02d5b1bb3
Merge pull request #487 from sachaaaaa/share_contacts
[multi-device] Share contact upon authorising secondary device
6 years ago
Mikunj 0883b1b650 Updated styles.
Merge commit clearnet into mod-badges
6 years ago
sachaaaaa 025ad10fc5 Ensure API objects are inited only once 6 years ago
Mikunj ea5bc24253 Updated design 6 years ago
Mikunj Varsani c48ae80468
Merge pull request #486 from Mikunj/profile-icons
Profile icons
6 years ago
sachaaaaa 43976c6c43
Merge pull request #494 from sachaaaaa/fix_last_hash
Fix last hash all being NULL in database
6 years ago
Beaudan Brown e9a2b57d37 Show crown icon for moderators 6 years ago