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
6de6b762e6
Ensure the latest contact signed prekey is used
6 years ago
51f161a613
Merge pull request #498 from Mikunj/mod-badges
...
Mod badges
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
025ad10fc5
Ensure API objects are inited only once
6 years ago
e9a2b57d37
Show crown icon for moderators
6 years ago
9fe613967a
Fix duplicate detection for sent messages in public chat
6 years ago
b10835ffc7
Share contact upon authorising secondary device
6 years ago
b3e2a5aba8
move refreshModStatus into constructor of channelAPI, just instantiate channelAPI now
6 years ago
35b6182074
Clean up after account registration failure
6 years ago
48b6bf54c1
Merge pull request #461 from Mikunj/qr-code
...
Pubkey QR code
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
ef8b515d70
Make sure we only initialise special conversations after both registration and storage load have complete
6 years ago
3380500a2d
Added QR code viewing.
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
8d77d6fd79
All the API updates, enable mod status retrieval and allow for message deletion
6 years ago
e4ecc5b389
A prepare for message deletion
6 years ago
c4dd10a5cd
Simplified profile setting. Renamed functions to be less confusing. Removed storing profile in local storage.
6 years ago
1f7787ecf7
Add token retrieval functions to public chat api
6 years ago
7e0217dca8
Merge pull request #439 from sachaaaaa/registration_done_secondary
...
[multi-device] Prevent showing inbox if secondary registration is ongoing
6 years ago
2c052a65a2
Display incoming messages in the primary device conversation
6 years ago
415ea7992c
Prevent showing inbox if secondary device registration is still ongoing
6 years ago
b5aee4f4be
Display "Pair New Device" in menu for non-secondary devices
6 years ago
895cedc801
Lint
6 years ago
3f4b94ba74
Transition to initialising rss feeds in schema update
6 years ago
48f2637ff9
lint
6 years ago
962469a54c
messenger and loki.network feeds
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
f857744e88
Revert sending id
6 years ago
f7039080af
Remove accidental swapfile, save messages with the id given to them from public server
6 years ago
143bf1bdc1
Fill out unregister channel stub, trigger unregister channel on conversation deletion
6 years ago
014558d939
Squash and clean of old PRs, move towards sending cleartext again
6 years ago
dd7bf1b2bb
Merge pull request #370 from msgmaxim/clipboard
...
Add a button to paste pubkey from clipboard if valid
6 years ago
cdd374a4b2
Add a toggle option for typing indicators; use short ttl for them
6 years ago
d0e73ed7f8
Add a button to paste pubkey from clipboard if valid
6 years ago
df2c4af67c
Run lint and check for ip or address when removing unreachable nodes
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
676cebdce4
Fix async
6 years ago
37e95cf7d2
remove unnecessary await
6 years ago
c53633e367
Clearnet p2p with https (no verification yet)
6 years ago
d12f6b6d32
Handle swarm nodes the same for us or contacts, attach our key to message api object
6 years ago
e520bf109a
Persist PoW difficulty and update if get response from snodes
6 years ago
2c12c8a1d8
Convert profile field in data message to use LokiProfile instead of signal Contact.
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
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
sachaaaaa
Mikunj Varsani
sachaaaaa
Beaudan Brown
Ryan Tharp
Mikunj
Maxim Shishmarev