Commit Graph

617 Commits (f9f31171019680ad9fc2b3ca76278534908316fb)

Author SHA1 Message Date
Vincent 0c4f57e57d Added session button types and session button colors 5 years ago
Vincent 98b4b18583 Added message selection inital functionality and added to buttons 5 years ago
Ryan Tharp 549e3b4516
Merge branch 'clearnet' into multidevice-publicchat 5 years ago
Maxim Shishmarev 5123fa0409
Merge pull request #669 from msgmaxim/restoration
Prompting the user to reset session on invalid ciphertext
5 years ago
Ryan Tharp 027bb76989 setPublicSource now marks convo active, make getPublicSendData use the lokiPublicChatAPI findOrCreateChannel, add some warnings 5 years ago
Maxim Shishmarev 19786108a3 address reviews 5 years ago
sachaaaaa acc19985f5 allow removing picture when avatar set to null (currently only possible via mobile) 5 years ago
sachaaaaa a29f0a4120 encrypted pictures for public chats 5 years ago
sachaaaaa 5b7baaf357 enable profile sharing after becoming friends for private messages 5 years ago
Maxim Shishmarev 81bfa90943 Prompting the user to reset session on invalid ciphertext 5 years ago
Maxim Shishmarev 2ab0d084f1
Merge pull request #645 from msgmaxim/group-invites
Public chat invitations
5 years ago
Maxim Shishmarev 89e5e919f2 Address more review comments 5 years ago
Maxim Shishmarev a5fce17d8c public chat invitations 6 years ago
Ryan Tharp 0d47f305ca add missing await 6 years ago
Maxim Shishmarev 4dd314c18f Enable profile pictures 6 years ago
Beaudan Brown 685ada5cc5 Merge branch 'clearnet' into prep-merge 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 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 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 1f4af59dad Delete public chat messages locally if not stored on the server 6 years ago
Beaudan Brown 653fd06451 Don't await for some background messages 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 a3635216db Enable sending audio recordings 6 years ago
Beaudan Brown 22df66c08f Fix missing await, fix undefined bug 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
Maxim Shishmarev 8be1c61f4c Highlight conversations with unread mentions of the user 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
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
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
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
Ryan Tharp 133f2a5656 replace publicSendData with LokiPublicChannelAPI instance 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
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
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
Ryan Tharp c57571fdfd loki.network rss feed 6 years ago
Beaudan c9f433fbba Save message id when sending/receiving to/from public server and lint 6 years ago
Beaudan f857744e88 Revert sending id 6 years ago
Beaudan 5bdfaeaf1d Don't send read receipts to public chats 6 years ago
Beaudan f718bf15d2 Prepare to delete message, send message id to server 6 years ago
Beaudan 143bf1bdc1 Fill out unregister channel stub, trigger unregister channel on conversation deletion 6 years ago
Beaudan 014558d939 Squash and clean of old PRs, move towards sending cleartext again 6 years ago
Beaudan b4cc9430be Add loki schema versioning and create new public conversation 6 years ago
Beaudan debd211fe5 Also don't send typing messages for people we aren't friends with 6 years ago
Beaudan Campbell-Brown fc12f01ab3
Merge pull request #374 from msgmaxim/no-read-receipt-unless-friends
Only send read receipts if friends
6 years ago
Beaudan Campbell-Brown b76f84acc5
Merge pull request #377 from msgmaxim/typing-indicators
Add a toggle option for typing indicators; use short ttl for them
6 years ago
Maxim Shishmarev cdd374a4b2 Add a toggle option for typing indicators; use short ttl for them 6 years ago
Maxim Shishmarev f12a7cee4d only send read receipts if friends 6 years ago
Beaudan 63396669bc Add eslint rule to enforce curlys, run eslint --fix to automatically apply this rule and add swapfiles to gitignore 6 years ago
Beaudan 96aaa7851d Send broadcast message instead of empty message to trigger things like session reset and disappearing messages. Also fix small bug where deleting a contact kept the (now removed) conversation open 6 years ago
Beaudan 580931c4fb Pass ourKey to message api, initialise these APIs after registration or when storage is ready so we always have ourKey 6 years ago
Beaudan Campbell-Brown 4330e48185
Merge pull request #307 from BeaudanBrown/fix-self-note
Fix not to self
6 years ago
Beaudan e1d2484797 Can't update conversation that hasn't been created yet 6 years ago
Beaudan ab15a4afd6 Review moving status setting to conversation init 6 years ago
Beaudan 3bb9d888dc Initialise conversation with ourselves as friends and don't allow it to be changed to anything else 6 years ago
Beaudan 94b125f2cf Consider friend requests that are still being sent as sent 6 years ago
Mikunj 2c12c8a1d8 Convert profile field in data message to use LokiProfile instead of signal Contact. 6 years ago
Mikunj 8808100796 Merge signal-1.24.0
# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	background.html
#	config/default.json
#	config/production.json
#	js/models/conversations.js
#	js/models/messages.js
#	js/views/conversation_view.js
#	js/views/inbox_view.js
#	js/views/settings_view.js
#	main.js
#	package.json
#	test/index.html
#	ts/components/conversation/ContactName.tsx
#	yarn.lock
6 years ago
Mikunj 3a8111020e Merge v1.23.0
# Conflicts:
#	background.html
#	package.json
#	yarn.lock
6 years ago
Mikunj 7387e88c97 Add showing friends in search. 6 years ago
Mikunj 1f03e04d8c Merge commit 'c75a756b2a58bd4a79890e34673d95d9f17f3f01' into signal-1.23
# Conflicts:
#	js/views/conversation_view.js
#	package.json
#	ts/components/ConversationListItem.tsx
#	ts/components/conversation/ConversationHeader.tsx
6 years ago
Mikunj 12ce0140de Left pane changes.
Merge commit 'b3ac1373fa64117fe2a9ccfddf3712f1826c06d9' into signal-1.23

# Conflicts:
#	_locales/en/messages.json
#	background.html
#	js/background.js
#	js/conversation_controller.js
#	js/models/conversations.js
#	js/models/messages.js
#	js/views/conversation_list_item_view.js
#	js/views/conversation_list_view.js
#	js/views/conversation_search_view.js
#	js/views/inbox_view.js
#	libtextsecure/account_manager.js
#	package.json
#	stylesheets/_global.scss
#	stylesheets/_index.scss
#	stylesheets/_modules.scss
#	test/_test.js
#	test/index.html
#	test/models/conversations_test.js
#	test/views/conversation_search_view_test.js
#	ts/components/ConversationListItem.tsx
#	ts/components/MainHeader.tsx
#	ts/components/conversation/ConversationHeader.tsx
#	ts/components/conversation/ResetSessionNotification.tsx
6 years ago
Mikunj 48c4ed1a29 Partial Merge commit 'bf904ddd129ceba8fa363ccf6d10ecd256c65f63' into signal-1.23
# Conflicts:
#	_locales/en/messages.json
#	app/sql.js
#	js/background.js
#	js/conversation_controller.js
#	js/models/conversations.js
#	js/views/inbox_view.js
#	main.js
6 years ago
Mikunj 57195017f9 Linting 6 years ago