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
51f161a613
Merge pull request #498 from Mikunj/mod-badges
...
Mod badges
6 years ago
0acea50acb
Merge pull request #490 from BeaudanBrown/incoming-public
...
Fix duplicate detection for sent messages in public chat
6 years ago
0883b1b650
Updated styles.
...
Merge commit clearnet into mod-badges
6 years ago
c48ae80468
Merge pull request #486 from Mikunj/profile-icons
...
Profile icons
6 years ago
e9a2b57d37
Show crown icon for moderators
6 years ago
72b3d02b52
Poll for moderators, store them on the conversation and use the list to determine our own mod status
6 years ago
e5eab74b1b
Fix #355 Display timestamp for friend requests
6 years ago
9fe613967a
Fix duplicate detection for sent messages in public chat
6 years ago
500a88dbab
Removed identicon.js
...
Updated profile image helper.
6 years ago
9beea2cbd3
Enforce curlies completely and lint with new settings
6 years ago
0c870d04e3
Stop polling when leaving public chat, only grab the most recent 100 messages on first poll
6 years ago
bf7742932b
Merge pull request #480 from BeaudanBrown/loop-stopping
...
Stop polling on public chat deletion
6 years ago
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
d2dcd6c23d
Stop polling when you leave the public chat, clear up a bit
6 years ago
eea6bac7e6
add setGroupName()
6 years ago
870dc7f904
Fix tests, refactor menu items to please linter and lint
6 years ago
66459ac4bd
Remove most of the right click and cog menu options for the public chats
6 years ago
a6abcaf826
Merge pull request #453 from Mikunj/profile-simplification
...
Profile simplification
6 years ago
831ae09576
Cherry pick "profile simplification" from Mik
6 years ago
27976a053c
Save the last retrieved message for public chats on the conversation
6 years ago
8066affd2c
Move initialisation of public and rss conversations to fix early loading error. Rename function to be more readable
6 years ago
616e952f8e
Add right click option to public chat messages to copy pubkey of sender
6 years ago
133f2a5656
replace publicSendData with LokiPublicChannelAPI instance
6 years ago
3178d67295
allow yourself to request deletion of messages
6 years ago
351fa09ad6
Only show delete option if have mod status and show different modal for mod deletion
6 years ago
e4ecc5b389
A prepare for message deletion
6 years ago
1b4105a3d0
Fix db stuff and remove unneeded message function
6 years ago
c4dd10a5cd
Simplified profile setting. Renamed functions to be less confusing. Removed storing profile in local storage.
6 years ago
700ed5d2a8
Some refactoring from reviews, and include the token in the message pipeline instead of getting in message_api
6 years ago
b5fd01a468
Add required metadata to sending pipeline and send to public channels
6 years ago
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
54f4fd843b
Merge pull request #440 from sachaaaaa/substitute_secondary_with_primary
...
[multi-device] Display incoming messages in the primary device conversation
6 years ago
dce8c8bcf7
Format message details to show secondary pubkey properly
6 years ago
2c052a65a2
Display incoming messages in the primary device conversation
6 years ago
4dd62a265c
Allow receiving and sending messages before lokiP2PApi is defined.
6 years ago
662c64f347
Remove ability to delete some rss conversations
6 years ago
3f4b94ba74
Transition to initialising rss feeds in schema update
6 years ago
d3cf055128
rss avatar guard
6 years ago
a67e7fcfe1
guard for CI fix
6 years ago
bbffa89308
make sure we have braces
6 years ago
c57571fdfd
loki.network rss feed
6 years ago
c9f433fbba
Save message id when sending/receiving to/from public server and lint
6 years ago
899bfc3b2b
Add channel id to message table and provide helper functions
6 years ago
f857744e88
Revert sending id
6 years ago
5bdfaeaf1d
Don't send read receipts to public chats
6 years ago
406938cf59
Cleaner forceSave
6 years ago
f7039080af
Remove accidental swapfile, save messages with the id given to them from public server
6 years ago
f718bf15d2
Prepare to delete message, send message id to server
6 years ago
143bf1bdc1
Fill out unregister channel stub, trigger unregister channel on conversation deletion
6 years ago
21f0149e22
Send profile and update it
6 years ago
014558d939
Squash and clean of old PRs, move towards sending cleartext again
6 years ago
b4cc9430be
Add loki schema versioning and create new public conversation
6 years ago
98f1c8d80b
Merge pull request #380 from BeaudanBrown/profile-fix
...
Catch this little rascal. Profile names should update consistently now
6 years ago
55152cd33a
Catch this little rascal. Profile names should update consistently now
6 years ago
debd211fe5
Also don't send typing messages for people we aren't friends with
6 years ago
fc12f01ab3
Merge pull request #374 from msgmaxim/no-read-receipt-unless-friends
...
Only send read receipts if friends
6 years ago
b76f84acc5
Merge pull request #377 from msgmaxim/typing-indicators
...
Add a toggle option for typing indicators; use short ttl for them
6 years ago
cdd374a4b2
Add a toggle option for typing indicators; use short ttl for them
6 years ago
f12a7cee4d
only send read receipts if friends
6 years ago
63396669bc
Add eslint rule to enforce curlys, run eslint --fix to automatically apply this rule and add swapfiles to gitignore
6 years ago
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
580931c4fb
Pass ourKey to message api, initialise these APIs after registration or when storage is ready so we always have ourKey
6 years ago
4330e48185
Merge pull request #307 from BeaudanBrown/fix-self-note
...
Fix not to self
6 years ago
e1d2484797
Can't update conversation that hasn't been created yet
6 years ago
ab15a4afd6
Review moving status setting to conversation init
6 years ago
3bb9d888dc
Initialise conversation with ourselves as friends and don't allow it to be changed to anything else
6 years ago
94b125f2cf
Consider friend requests that are still being sent as sent
6 years ago
fd6f6c6a8c
Merge pull request #290 from Mikunj/loki-profile
...
Convert profile field in DataMessage to use LokiProfile
6 years ago
2c12c8a1d8
Convert profile field in data message to use LokiProfile instead of signal Contact.
6 years ago
53cbfb1f5c
Merge branch 'development' into fix-friend-request-logic
6 years ago
12cce8fe47
Auto accept friend request messages if we were already friends with the user.
...
Lint fixes for previous files.
6 years ago
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
3a8111020e
Merge v1.23.0
...
# Conflicts:
# background.html
# package.json
# yarn.lock
6 years ago
7387e88c97
Add showing friends in search.
6 years ago
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
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
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
57195017f9
Linting
6 years ago
e343a04eea
Merge commit '18b5b7c046436f2defab2e20407e22da180bf97b' into signal-1.22
...
# Conflicts:
# app/sql.js
# background.html
# config/default.json
# js/background.js
# js/models/conversations.js
# js/models/messages.js
# js/modules/data.js
# js/signal_protocol_store.js
# js/views/conversation_search_view.js
# libtextsecure/message_receiver.js
# libtextsecure/sendmessage.js
# main.js
# package.json
# preload.js
# test/index.html
# ts/components/Avatar.tsx
# ts/components/conversation/ConversationHeader.md
# ts/components/conversation/ConversationHeader.tsx
6 years ago
22f7a352f9
updateLastMessage: If we don't update last text, clear it
6 years ago
62de2a229d
Add logging to track synchronization in message processing
6 years ago
74cb808763
New MessageController as the single place for in-memory messages
6 years ago
274949b247
Enable long message send as an attachment
6 years ago
4d8fbe95ff
Retry send: Always remove all errors and recalculate recipients
6 years ago
8c4d90df07
Send long text as an attachment instead of inline
...
Remove Android length warning
Handle incoming long message attachments
Show long download pending status in message bubble
Fix the width of the smallest spinner
Remove Android length warning from HTML templates
6 years ago
32fa5cccde
Send sync sent messages properly in 1-member group
6 years ago
c76d537482
Note to Self: On just expire timer update, set TIMER_UPDATE flag
6 years ago
b3ac1373fa
Move left pane entirely to React
6 years ago
768007a269
Message Detail: Ensure that quotes are not clickable
6 years ago
6ffbc0ac06
Archive Conversation
6 years ago
812f895e12
Bring lastMessage and lastMessageStatus back to conversation
6 years ago
dcd16775c3
Note to Self: set expirationStartTimestamp before sending sync
6 years ago
eb7ad48951
Only put nbsp before last token in msg body if token is <12 chars
6 years ago
9717267b00
Review
6 years ago
d0d57ea8c7
Add more functionality to the conversation right click menu, add right click for messages, change some of the ways toasts/confirmation dialogs are created, auto focus text input for nickname, clean up some stuff
6 years ago
df93c97b48
Added ability to delete contacts and destroy all sessions with them. Added right click menu to contacts/conversations in list which can block, delete messages and delete contact
6 years ago
dca2462f6c
Merge pull request #248 from sachaaaaa/friend_request_expiry
...
Add requestExpired state to Friend Request state machine
6 years ago
77fb5b4a71
Missing closing parenthesis
6 years ago
353302ca16
Use Array.includes instead of Array.indexOf
...
Co-Authored-By: sachaaaaa <40749766+sachaaaaa@users.noreply.github.com>
6 years ago
sachaaaaa
Mikunj Varsani
Mikunj
Beaudan Brown
Ryan Tharp
sachaaaaa
Maxim Shishmarev
Scott Nonnenberg