Commit graph

3181 commits

Author SHA1 Message Date
Beaudan
3bb9d888dc Initialise conversation with ourselves as friends and don't allow it to be changed to anything else 2019-06-14 17:30:43 +10:00
Beaudan
ca31649207 Trial value wasn't being initialised big enough for very low difficulty, also development should not have been there but I don't think it was doing anything 2019-06-12 17:26:08 +10:00
Beaudan
0948a344d2 Review refactor 2019-06-11 17:27:27 +10:00
Beaudan
d5546b9473 Lint 2019-06-11 16:30:45 +10:00
Beaudan
b6b0248e9d Retrieve from seed 2019-06-11 16:30:02 +10:00
Beaudan
1f74088586 Send to IP 2019-06-11 16:30:01 +10:00
Beaudan
6b2b9ce926 Remove default port and use port from storage server responses 2019-06-11 16:30:01 +10:00
Beaudan
eea2b8e6a7 Do port null check inside rpc call 2019-06-11 16:29:04 +10:00
Beaudan
52c191fc94 Merge branch 'development' into clearnet 2019-06-11 16:23:31 +10:00
sachaaaaa
9d6c5bff36 make unverified https queries to the snodes 2019-06-07 16:12:25 +10:00
Beaudan
7141847dfb Restart sendMessage logic if PoW changed an dfix NaN bug 2019-06-03 13:48:01 +10:00
Beaudan
f01d8088b7 Remove development PoW 2019-06-03 13:38:15 +10:00
Beaudan
dad52a784d Change wrong pow http response 2019-06-03 13:37:34 +10:00
Beaudan
dbcaaf98dc Lint 2019-06-03 13:37:34 +10:00
Beaudan
c27d1ef69a Clean some stuff in loki_rpc and get new difficulty from successful requests 2019-06-03 13:37:34 +10:00
Beaudan
e520bf109a Persist PoW difficulty and update if get response from snodes 2019-06-03 13:37:34 +10:00
Beaudan Campbell-Brown
e9b1359bab
Merge pull request #295 from BeaudanBrown/refactor-sendmessage
Refactor sendmessage
2019-06-03 13:37:00 +10:00
Beaudan
18a87d5463 Review changes 2019-06-03 13:35:58 +10:00
Beaudan Campbell-Brown
fd6f6c6a8c
Merge pull request #290 from Mikunj/loki-profile
Convert profile field in DataMessage to use LokiProfile
2019-06-03 13:09:33 +10:00
Beaudan
c02d5d4053 Lint 2019-06-03 10:42:18 +10:00
Beaudan
709db4bf54 Make sendMessage take options, remove redundant retrieve function and get constant 2019-06-03 10:26:42 +10:00
Beaudan
b43978ece1 Initial refactoring of sendmessage 2019-05-31 13:58:01 +10:00
Beaudan Campbell-Brown
1e11a6527c
Merge pull request #289 from Mikunj/p2p-ping
Updated pinging logic.
2019-05-31 11:18:20 +10:00
Beaudan Campbell-Brown
50c7da4432
Merge pull request #280 from Mikunj/fix-friend-request-logic
Fix friend request logic.
2019-05-31 11:17:20 +10:00
Mikunj
2c12c8a1d8 Convert profile field in data message to use LokiProfile instead of signal Contact. 2019-05-29 09:26:16 +10:00
Mikunj
53cbfb1f5c Merge branch 'development' into fix-friend-request-logic 2019-05-29 09:08:22 +10:00
sachaaaaa
1b1c18b928 Patch from Beau 2019-05-27 12:09:11 +10:00
Mikunj
147861790b Always send application/json as content type in rpc. 2019-05-27 11:27:52 +10:00
Mikunj
bc6586e5ce Removed duplicated function. 2019-05-27 09:46:02 +10:00
Mikunj
f77b67d358 Updated tests.
Fix some minor logic.
2019-05-24 12:41:00 +10:00
Mikunj
986d34bbd9 linting 2019-05-24 11:07:58 +10:00
Mikunj
d4de4b13dd Fix incorrect import. 2019-05-24 11:07:13 +10:00
Mikunj
b4390a8c95 Updated pinging logic. 2019-05-24 10:57:30 +10:00
sachaaaaa
edd5915bf2 Fix use .length on object 2019-05-22 15:14:58 +10:00
sachaaaaa
5f77f751d9 Replace generator function and other various fixes 2019-05-22 15:14:58 +10:00
sachaaaaa
09a9cfbf37 Refactor long polling for better concurrent requests 2019-05-22 15:14:58 +10:00
Beaudan Campbell-Brown
e99cec9c09
Merge pull request #272 from Mikunj/signal-1.24
Signal 1.24
2019-05-22 14:56:37 +10:00
Mikunj
12cce8fe47 Auto accept friend request messages if we were already friends with the user.
Lint fixes for previous files.
2019-05-16 16:18:23 +10:00
beaudan
54bd75e9a6 Wait for a longer time after failed poll and extend default timeout 2019-05-13 06:17:13 +10:00
Mikunj
fbbf454c49 Merge branch 'development' into signal-1.24 2019-04-29 16:24:34 +10:00
Beaudan Campbell-Brown
318371a652
Merge pull request #264 from BeaudanBrown/remove-signal-references
Remove Signal references
2019-04-29 08:39:44 +10:00
Mikunj
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
2019-04-24 13:25:20 +10:00
Mikunj
61b862b021 Merge signal 1.24.1 2019-04-18 13:27:54 +10:00
Mikunj
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
2019-04-18 12:45:19 +10:00
Mikunj
3152f92e30 Merge signal 1.23.2
# Conflicts:
#	app/sql.js
#	js/conversation_controller.js
#	package.json
2019-04-18 12:31:39 +10:00
Mikunj
3a8111020e Merge v1.23.0
# Conflicts:
#	background.html
#	package.json
#	yarn.lock
2019-04-18 11:12:02 +10:00
Scott Nonnenberg
ef670bec3f Ensure that we have all conversations in redux store 2019-04-18 10:37:59 +10:00
Mikunj
7387e88c97 Add showing friends in search. 2019-04-18 10:37:23 +10:00
Mikunj
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
2019-04-18 10:13:49 +10:00
Scott Nonnenberg
fca40cb548 Disable keyboard shortcut for conversation archive 2019-04-17 14:19:32 -07:00