52c191fc94
Merge branch 'development' into clearnet
6 years ago
9d6c5bff36
make unverified https queries to the snodes
6 years ago
7141847dfb
Restart sendMessage logic if PoW changed an dfix NaN bug
6 years ago
f01d8088b7
Remove development PoW
6 years ago
dad52a784d
Change wrong pow http response
6 years ago
dbcaaf98dc
Lint
6 years ago
c27d1ef69a
Clean some stuff in loki_rpc and get new difficulty from successful requests
6 years ago
e520bf109a
Persist PoW difficulty and update if get response from snodes
6 years ago
e9b1359bab
Merge pull request #295 from BeaudanBrown/refactor-sendmessage
...
Refactor sendmessage
6 years ago
18a87d5463
Review changes
6 years ago
fd6f6c6a8c
Merge pull request #290 from Mikunj/loki-profile
...
Convert profile field in DataMessage to use LokiProfile
6 years ago
c02d5d4053
Lint
6 years ago
709db4bf54
Make sendMessage take options, remove redundant retrieve function and get constant
6 years ago
b43978ece1
Initial refactoring of sendmessage
6 years ago
1e11a6527c
Merge pull request #289 from Mikunj/p2p-ping
...
Updated pinging logic.
6 years ago
50c7da4432
Merge pull request #280 from Mikunj/fix-friend-request-logic
...
Fix friend request logic.
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
1b1c18b928
Patch from Beau
6 years ago
147861790b
Always send application/json as content type in rpc.
6 years ago
bc6586e5ce
Removed duplicated function.
6 years ago
f77b67d358
Updated tests.
...
Fix some minor logic.
6 years ago
986d34bbd9
linting
6 years ago
d4de4b13dd
Fix incorrect import.
6 years ago
b4390a8c95
Updated pinging logic.
6 years ago
edd5915bf2
Fix use .length on object
6 years ago
5f77f751d9
Replace generator function and other various fixes
6 years ago
09a9cfbf37
Refactor long polling for better concurrent requests
6 years ago
e99cec9c09
Merge pull request #272 from Mikunj/signal-1.24
...
Signal 1.24
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
54bd75e9a6
Wait for a longer time after failed poll and extend default timeout
6 years ago
fbbf454c49
Merge branch 'development' into signal-1.24
6 years ago
318371a652
Merge pull request #264 from BeaudanBrown/remove-signal-references
...
Remove Signal references
6 years ago
b8ef6c2cc6
Loki changes
...
Added friends section in search.
This is because contacts is now used in signal for something else and we don't want to clash meanings.
Styling fixes
Add dropdown options into mainheader
Updated styling
Restore StartNewConversation to the old ui style of loki messenger.
Fix friend search display.
Fix header expand animation.
Hooked up menu actions.
Linting.
More styling changes.
Fix tests.
Added back in the loki logo below the gutter.
Fix toast positioning.
Fix context menu showing incorrectly on virtual lists.
Added tabs.
Linting
6 years ago
61b862b021
Merge signal 1.24.1
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
3152f92e30
Merge signal 1.23.2
...
# Conflicts:
# app/sql.js
# js/conversation_controller.js
# package.json
6 years ago
3a8111020e
Merge v1.23.0
...
# Conflicts:
# background.html
# package.json
# yarn.lock
6 years ago
ef670bec3f
Ensure that we have all conversations in redux store
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
fca40cb548
Disable keyboard shortcut for conversation archive
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
cab389fe2e
Merge pull request #267 from BeaudanBrown/move-filtering
...
Persistent last hash
6 years ago
b31fbcaa17
Don't send if message body is too long
6 years ago
6a290f4918
Merge pull request #266 from Mikunj/fixes
...
UI Fixes
6 years ago
8ff647e3cd
Return instead of await
6 years ago
Beaudan
sachaaaaa
Mikunj
Scott Nonnenberg