0f74a002df
Merge pull request #601 from BeaudanBrown/sync-messages
...
[multi-device] Sync messages
6 years ago
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
f16b032056
Handle sync messages properly for some edge cases, ensure we always have a primaryDevicePubKey, send contact sync message
6 years ago
cc8277f54d
Better variable name and use it in more places
6 years ago
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
d97eced37b
Merge branch 'clearnet' into multi-device
6 years ago
a3019e12bf
Hide android friend request accepts and lint
6 years ago
f538aeea50
Remove old link preview system
6 years ago
29e83cadbf
Check against null message body when detecting mentions
6 years ago
8d6fee4aec
Merge branch 'clearnet' into multi-device
6 years ago
53bdf14321
refactor
6 years ago
8be1c61f4c
Highlight conversations with unread mentions of the user
6 years ago
1f3311bc5d
Save device mappings upon accepting friend request + various fixes
6 years ago
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
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
9beea2cbd3
Enforce curlies completely and lint with new settings
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
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
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
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
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
dce8c8bcf7
Format message details to show secondary pubkey properly
6 years ago
2c052a65a2
Display incoming messages in the primary device conversation
6 years ago
c57571fdfd
loki.network rss feed
6 years ago
899bfc3b2b
Add channel id to message table and provide helper functions
6 years ago
f857744e88
Revert sending id
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
21f0149e22
Send profile and update it
6 years ago
014558d939
Squash and clean of old PRs, move towards sending cleartext again
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
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
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
Beaudan Campbell-Brown
sachaaaaa
Maxim Shishmarev
Mikunj Varsani
Mikunj
Ryan Tharp
sachaaaaa