Commit Graph

6145 Commits (c168e34adffab9d34983aad6a0ffd0a2cb130d0c)
 

Author SHA1 Message Date
Ryan Tharp a976388315
Handle annotations omit correctly 6 years ago
Ryan Tharp b62801bc2a
fix typo CI found 6 years ago
Ryan Tharp 968ad9227c
refactor
pls forgive, using github editor for expedience, untested changes
6 years ago
Ryan Tharp c8cf05558f
pollOnceForMessages() move lastGot up, address Sacha's review 6 years ago
Ryan Tharp d85cd980c2
Update js/modules/loki_public_chat_api.js
oof

Co-Authored-By: sachaaaaa <40749766+sachaaaaa@users.noreply.github.com>
6 years ago
sachaaaaa e2e2d1e845 address review 6 years ago
sachaaaaa 7756d4f0f3 Merge branch 'clearnet' into PR_file_server
* clearnet:
  fix method
  separate out new/open, more lint/cleanup
  separate out note to self
  create window.mixpanel here
  use window.mixpanel, remove eventEmitter
  allow mixpanel to be already set up elsewhere
  Address review comments
  Add missing file in tests
  Add UI elements for searching and selecting members in a group chat
  Desktop Analytics
  Replaced value with a descriptive constant.
  Add comment to fix up confusion.
  Keep a cache of the last 5 fetched messages for public chat so we can use it to detect duplicate messages.

# Conflicts:
#	js/background.js
#	js/modules/loki_public_chat_api.js
6 years ago
Maxim Shishmarev 16692696e0 address reviews 6 years ago
Ryan Tharp 71fde0b9e6
Merge branch 'clearnet' into publicchat_signed 6 years ago
sachaaaaa 155a3b8f17
Merge pull request #512 from neuroscr/desktop-analytics
Desktop Analytics
6 years ago
sachaaaaa a3d677819b
Merge pull request #508 from Mikunj/duplicate-message-fix
Public chat duplicate message fix
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
Ryan Tharp 587df45086 create window.mixpanel here 6 years ago
Ryan Tharp 51eaa90823 use window.mixpanel, remove eventEmitter 6 years ago
Ryan Tharp 68186afba2 lint and remove unneeded params 6 years ago
Maxim Shishmarev ff7b3967bf
Merge pull request #513 from msgmaxim/mentions
Add UI elements for searching and selecting members in a group chat
6 years ago
sachaaaaa 3b450e28da lint 6 years ago
sachaaaaa 87a0ad2bfb
Merge pull request #519 from sachaaaaa/fix_clean_rejected_pairing
[multi-device] Remove rejected authorisation from database
6 years ago
sachaaaaa f8e9e1d3bd Remove rejected authorisation from database 6 years ago
sachaaaaa ea17437a0c
Merge pull request #509 from sachaaaaa/show_paired_devices
[multi-device] Display list of paired device in modal
6 years ago
sachaaaaa e07f81c150 Add LokiFileServerAPI 6 years ago
sachaaaaa dc6d3b5ca2 Add LokiPublicChatAPI (extends LokiAppDotNetAPI) 6 years ago
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