fa6cde6cb9
use await/async
6 years ago
8ecf057386
Display list of paired device in modal
6 years ago
d3653e8665
lint after manual merge
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
d17f86679f
Merge pull request #495 from sachaaaaa/fix_unknown_signedkey
...
[multi-device] Ensure the latest contact signed prekey is used
6 years ago
712afef8e2
simplify
6 years ago
7ff32258f0
Merge pull request #499 from sachaaaaa/auto_friend_secondary
...
[multi-device] Auto friend request to sync contacts
6 years ago
44da907fb7
Merge pull request #501 from sachaaaaa/search_returns_primary_device
...
[multi-device] Search returns primary device conversation
6 years ago
bd16bc5b9b
lint
6 years ago
6de6b762e6
Ensure the latest contact signed prekey is used
6 years ago
3152637cdc
Fix more check on deletion.
6 years ago
69eab9f196
Merge pull request #503 from msgmaxim/shorten_pubkey
...
Shorten pubkeys in quotations too
6 years ago
0d9e4bbf45
Only shorten pubkeys if name is present
6 years ago
59609a13f9
Merge pull request #502 from neuroscr/clearnet
...
pass serverId back to the server
6 years ago
08cab426c5
Shorten pubkeys in quotations too
6 years ago
ca5275b410
better guard
6 years ago
e6d22aab19
pass serverId back to the server
6 years ago
d3c3184405
Search returns primary device when looking up secondary pub key
6 years ago
530a9201a2
Bump version.
6 years ago
ec790ddf89
Merge pull request #500 from Mikunj/link-preview-fix
...
Fix unnecessary link preview fetches.
6 years ago
a9710a68db
Purge cache on failure.
6 years ago
51f161a613
Merge pull request #498 from Mikunj/mod-badges
...
Mod badges
6 years ago
d302004225
Merge pull request #493 from BeaudanBrown/delete-polling-fix
...
Make sure we are always updating the last deleted id
6 years ago
0acea50acb
Merge pull request #490 from BeaudanBrown/incoming-public
...
Fix duplicate detection for sent messages in public chat
6 years ago
0636e635d5
Fix unnecessary link preview fetches.
6 years ago
f9df221638
Merge pull request #497 from sachaaaaa/prevent_multiple_retrievers
...
[multi-device] Ensure API objects are inited only once
6 years ago
cf0628a001
Secondary device to send friend request automatically to all sync contact received
6 years ago
e6d62cb22c
Review changes.
...
Increase mod time to 30 seconds.
6 years ago
c69bd81343
Undo defaultPublicChatServer change,
6 years ago
f860076587
Modified colour of dark mod badge
6 years ago
0b898612d9
Linting.
6 years ago
a02d5b1bb3
Merge pull request #487 from sachaaaaa/share_contacts
...
[multi-device] Share contact upon authorising secondary device
6 years ago
0883b1b650
Updated styles.
...
Merge commit clearnet into mod-badges
6 years ago
025ad10fc5
Ensure API objects are inited only once
6 years ago
ea5bc24253
Updated design
6 years ago
c48ae80468
Merge pull request #486 from Mikunj/profile-icons
...
Profile icons
6 years ago
43976c6c43
Merge pull request #494 from sachaaaaa/fix_last_hash
...
Fix last hash all being NULL in database
6 years ago
e9a2b57d37
Show crown icon for moderators
6 years ago
ec5a69f1cf
Merge pull request #489 from msgmaxim/replies
...
Enable quotes in public chats
6 years ago
3beb6004db
Fix last hash all being NULL in database
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
ec3d9c5f1c
Merge pull request #491 from BeaudanBrown/better-dev
...
Improve dev vs productions modes
6 years ago
97746307f0
Make sure we are always updating the last deleted id
6 years ago
440dc75584
Merge pull request #492 from sachaaaaa/fix_friend_request_timestamp
...
Display timestamp for friend requests
6 years ago
700c835782
Update ts/components/conversation/FriendRequest.md
...
Co-Authored-By: Mikunj Varsani <Mikunj@users.noreply.github.com>
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
5a35f05f29
Fix start-prod(-multi) to actually use different identities than default messenger, also connect dev instances to the dev public chat and clean up the config files a lil
6 years ago
5dc52f0858
Fix incorrect hue shifting
6 years ago
5cf63af3a3
Enable quotes in public chats
6 years ago
sachaaaaa
sachaaaaa
Mikunj
Mikunj Varsani
Maxim Shishmarev
Ryan Tharp
Beaudan Brown