Commit Graph

5910 Commits (7756d4f0f3a89971f39c011040d41021b7499be0)
 

Author SHA1 Message Date
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
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
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
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 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 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
Mikunj 75a527e828 Replaced value with a descriptive constant. 6 years ago
Mikunj 001d882273 Add comment to fix up confusion. 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
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
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
Mikunj 0883b1b650 Updated styles.
Merge commit clearnet into mod-badges
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
Beaudan Campbell-Brown ec5a69f1cf
Merge pull request #489 from msgmaxim/replies
Enable quotes in public chats
6 years ago
sachaaaaa 3beb6004db Fix last hash all being NULL in database 6 years ago
Beaudan Brown 72b3d02b52 Poll for moderators, store them on the conversation and use the list to determine our own mod status 6 years ago
Mikunj Varsani ec3d9c5f1c
Merge pull request #491 from BeaudanBrown/better-dev
Improve dev vs productions modes
6 years ago
Beaudan Brown 97746307f0 Make sure we are always updating the last deleted id 6 years ago