Commit Graph

878 Commits (799fcb80f4fb53ec73aa67b769e45838873d1ba1)

Author SHA1 Message Date
Ryan Tharp 6cde9aa263
Merge pull request #638 from neuroscr/multidevice-publicchat
Public Chat - home server refactor / read public chat avatars from home server
6 years ago
Maxim Shishmarev 89e5e919f2 Address more review comments 6 years ago
Maxim Shishmarev 56bb2ed792 Address review comments 6 years ago
Maxim Shishmarev 8ea82b14e3 Add channel id field to invitations 6 years ago
Maxim Shishmarev a5fce17d8c public chat invitations 6 years ago
Maxim Shishmarev 9d50c21b29
Merge pull request #635 from msgmaxim/context-menu-select
Don't select messages when context menu is shown
6 years ago
Ryan Tharp 0d47f305ca add missing await 6 years ago
Maxim Shishmarev 8b2876dadc Disable context menu and message selection for RSS feed 6 years ago
Maxim Shishmarev 2262b41cd7 Prevent hiding the context menu by clicking away to also potentially select messages 6 years ago
Maxim Shishmarev 4dd314c18f Enable profile pictures 6 years ago
sachaaaaa 6c28b1aa79
Merge pull request #623 from loki-project/multi-device
Multi device
6 years ago
Maxim Shishmarev d1c450a213
Merge pull request #621 from msgmaxim/select-messages
Prevent clicking on quote from selecting the message
6 years ago
Beaudan Brown 685ada5cc5 Merge branch 'clearnet' into prep-merge 6 years ago
Beaudan Campbell-Brown a2e8e6480f
Merge pull request #539 from neuroscr/multidevice-publicchat
[multi-device] public chat
6 years ago
Maxim Shishmarev 6c4fa6986b Prevent clicking on quote from selecting the message 6 years ago
Beaudan Brown f1c155b943 Stop sending sync messages to public chats and mark messages from any of our devices as outgoing 6 years ago
Beaudan Campbell-Brown b42a8aab1f
Typo
Co-Authored-By: sachaaaaa <40749766+sachaaaaa@users.noreply.github.com>
6 years ago
Beaudan Brown 807f4cbd2a Storing primary device pubkey on the conversation model for easier access, ensuring that we accept all the friend requests from the primary conversation rather than the secondary 6 years ago
Beaudan Brown 24a687c106 Throttle the refreshing of device mappings to once every minute 6 years ago
Beaudan Campbell-Brown 6611a10855
Merge pull request #590 from BeaudanBrown/session-reset-on-fr
Session reset on fr
6 years ago
Beaudan Brown c31535edb4 Rename blockSync, only send contacts and profile if sending a GRANT request, do *not* always be friends with secondary devices because we still need to complete a friend request exchange 6 years ago
Beaudan Brown 332cd30052 Send contact sync message when becoming friends with contact and auto accept/send friend requests when receiving contact sync 6 years ago
Beaudan Campbell-Brown 0f74a002df
Merge pull request #601 from BeaudanBrown/sync-messages
[multi-device] Sync messages
6 years ago
Beaudan Brown 15c07ea7df Sync secondary devices again but handle the receiving of them properly 6 years ago
Maxim Shishmarev 027e17f7d0 Reset multi selection when conversation is deleted/changed 6 years ago
Beaudan Brown accd16cae1 Trigger friend request received update for the correct device conversation, throttle the sending of automated friend requests and don't send them to devices which sent *us* a friend request 6 years ago
Maxim Shishmarev 7c96990119 Correctly handle server errors in multi-deletion 6 years ago
Maxim Shishmarev 8677fb15a0 Select multiple messages and bulk deletion 6 years ago
Beaudan Brown f16b032056 Handle sync messages properly for some edge cases, ensure we always have a primaryDevicePubKey, send contact sync message 6 years ago
Maxim Shishmarev 395daf3aba Use Array.includes in place of Array.indexOf 6 years ago
Maxim Shishmarev a2f836c690 Address review comments 6 years ago
Maxim Shishmarev 7c05939f55 Add group admins and the ability to remove members from private groups 6 years ago
Maxim Shishmarev 9f81f67460 Can leave private group chats 6 years ago
Maxim Shishmarev f5e9a870f7 Add support for mentions in private group chats 6 years ago
Maxim Shishmarev cf18572049 Adding new group members; establishing sessions between non-friends 6 years ago
Maxim Shishmarev 0d19b708f9 Creating private group chats between friends 6 years ago
Maxim Shishmarev 1f4af59dad Delete public chat messages locally if not stored on the server 6 years ago
Beaudan Brown e9dc3b531e Simplify auto accept check 6 years ago
Beaudan Brown 653fd06451 Don't await for some background messages 6 years ago
Beaudan Brown 8ccf62ed4e Trigger endSession code if we receive a friend request from a friend 6 years ago
Beaudan Brown cc8277f54d Better variable name and use it in more places 6 years ago
Beaudan Brown 883feb668d The rest of my multidevice work, send messages to all the correct devices and automatic friend request if not friends with a device 6 years ago
Beaudan Campbell-Brown aa66b28ffe
Merge pull request #579 from BeaudanBrown/friends-with-any
Add isFriendsWithAnyDevice and use it in relevant places
6 years ago
Beaudan Brown 76b36845bb Add isFriendsWithAnyDevice and use it in relevant places 6 years ago
Beaudan Brown 08ad913105 Add explicit isSecondary flag to conversation list items so they can remain hidden in the menu after they become friends etc 6 years ago
Beaudan Brown 2f52995e18 Fix the delete messages button to not break the conversation 6 years ago
Beaudan Brown d97eced37b Merge branch 'clearnet' into multi-device 6 years ago
Beaudan Brown a3635216db Enable sending audio recordings 6 years ago
Beaudan Brown 22df66c08f Fix missing await, fix undefined bug 6 years ago
Beaudan Brown a3019e12bf Hide android friend request accepts and lint 6 years ago
Beaudan Campbell-Brown ac80ef0d4e
Merge pull request #557 from BeaudanBrown/add-server
Add server
6 years ago
Beaudan Brown f538aeea50 Remove old link preview system 6 years ago
Beaudan Brown 29e83cadbf Check against null message body when detecting mentions 6 years ago
Beaudan Brown 4e70b66131 Extract the async token grab from the server api constructor and put in the factory. Fix up the areas this affects 6 years ago
Beaudan Brown 5d2f7ddb20 Add messages needed for UI, bit of house work 6 years ago
Beaudan Brown 8d6fee4aec Merge branch 'clearnet' into multi-device 6 years ago
sachaaaaa 53bdf14321 refactor 6 years ago
Maxim Shishmarev 8be1c61f4c Highlight conversations with unread mentions of the user 6 years ago
sachaaaaa 1f3311bc5d Save device mappings upon accepting friend request + various fixes 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
Mikunj Varsani 51f161a613
Merge pull request #498 from Mikunj/mod-badges
Mod badges
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 0883b1b650 Updated styles.
Merge commit clearnet into mod-badges
6 years ago
Mikunj Varsani c48ae80468
Merge pull request #486 from Mikunj/profile-icons
Profile icons
6 years ago
Beaudan Brown e9a2b57d37 Show crown icon for moderators 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
sachaaaaa e5eab74b1b Fix #355 Display timestamp for friend requests 6 years ago
Beaudan Brown 9fe613967a Fix duplicate detection for sent messages in public chat 6 years ago
Mikunj 500a88dbab Removed identicon.js
Updated profile image helper.
6 years ago
Beaudan Brown 9beea2cbd3 Enforce curlies completely and lint with new settings 6 years ago
Beaudan Brown 0c870d04e3 Stop polling when leaving public chat, only grab the most recent 100 messages on first poll 6 years ago
Beaudan Campbell-Brown bf7742932b
Merge pull request #480 from BeaudanBrown/loop-stopping
Stop polling on public chat deletion
6 years ago
Beaudan Campbell-Brown 6e6428928c
Merge pull request #479 from neuroscr/use-user-obj
Make sure public chat timers can't be restarted / Channel name bug fix
6 years ago
Beaudan Brown d2dcd6c23d Stop polling when you leave the public chat, clear up a bit 6 years ago
Ryan Tharp eea6bac7e6 add setGroupName() 6 years ago
Beaudan Brown 870dc7f904 Fix tests, refactor menu items to please linter and lint 6 years ago
Beaudan Brown 66459ac4bd Remove most of the right click and cog menu options for the public chats 6 years ago
Beaudan Campbell-Brown a6abcaf826
Merge pull request #453 from Mikunj/profile-simplification
Profile simplification
6 years ago
Mikunj 831ae09576 Cherry pick "profile simplification" from Mik 6 years ago
Beaudan Brown 27976a053c Save the last retrieved message for public chats on the conversation 6 years ago
Beaudan Brown 8066affd2c Move initialisation of public and rss conversations to fix early loading error. Rename function to be more readable 6 years ago
Beaudan 616e952f8e Add right click option to public chat messages to copy pubkey of sender 6 years ago
Ryan Tharp 133f2a5656 replace publicSendData with LokiPublicChannelAPI instance 6 years ago
Ryan Tharp 3178d67295 allow yourself to request deletion of messages 6 years ago
Beaudan Brown 351fa09ad6 Only show delete option if have mod status and show different modal for mod deletion 6 years ago
Beaudan Brown e4ecc5b389 A prepare for message deletion 6 years ago
Beaudan Brown 1b4105a3d0 Fix db stuff and remove unneeded message function 6 years ago
Mikunj c4dd10a5cd Simplified profile setting. Renamed functions to be less confusing. Removed storing profile in local storage. 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 b5fd01a468 Add required metadata to sending pipeline and send to public channels 6 years ago
sachaaaaa 16cc1cb400
Merge pull request #443 from sachaaaaa/show_secondary_pubkey_message_details
[multi-device] Format message details to show secondary pubkey properly
6 years ago
sachaaaaa 54f4fd843b
Merge pull request #440 from sachaaaaa/substitute_secondary_with_primary
[multi-device] Display incoming messages in the primary device conversation
6 years ago
sachaaaaa dce8c8bcf7 Format message details to show secondary pubkey properly 6 years ago
sachaaaaa 2c052a65a2 Display incoming messages in the primary device conversation 6 years ago
sachaaaaa 4dd62a265c Allow receiving and sending messages before lokiP2PApi is defined. 6 years ago
Beaudan Brown 662c64f347 Remove ability to delete some rss conversations 6 years ago
Beaudan Brown 3f4b94ba74 Transition to initialising rss feeds in schema update 6 years ago
Ryan Tharp d3cf055128 rss avatar guard 6 years ago
Ryan Tharp a67e7fcfe1 guard for CI fix 6 years ago
Ryan Tharp bbffa89308 make sure we have braces 6 years ago