oxen-io/session-desktop
1
0
Fork 0
mirror of https://github.com/oxen-io/session-desktop.git synced 2023-12-14 02:12:57 +01:00
Code Issues Projects Releases Wiki Activity
8501 commits 5 branches 83 tags 171 MiB
Commit graph

8501 commits

This branch
This branch
All branches
Author SHA1 Message Date
Vincent
6078be1657 revive-ts-refactor 2020-07-08 17:12:34 +10:00
Vincent
83528f4b8d Merge branch 'clearnet' of https://github.com/loki-project/session-desktop into refactor-ts-react 2020-07-08 16:42:30 +10:00
Audric Ackermann
d5cfcf9edc
Merge pull request #1223 from Bilb/various-closed-group-fixes 
* fix display name and avatar to be shown when message is coming from a secondary device
* fix show of expiretimer in the group conversation when it is for it.
* fix a bug creating empty conversation when sync closed group message is received on secondary device
* trigger an expiretimer update message to all members when updating a group.
* trigger an expiretimer update message when sending back group details (after a requestGroupInfo)
 2020-07-08 11:29:08 +10:00
Audric Ackermann
696fbd8d7a
address review 2020-07-08 11:14:54 +10:00
Maxim Shishmarev
2f47690ead
Merge pull request #1224 from msgmaxim/fix-retrieve 
Fix retrieving with pubkey object
 2020-07-08 11:05:25 +10:00
Maxim Shishmarev
a2b80a5e68 Address review comments 2020-07-08 10:57:24 +10:00
Audric Ackermann
bd67040086
handle empty group id after decoding and set it to null 2020-07-08 10:13:21 +10:00
Audric Ackermann
178060e4d2
handle Uint8Array in protobuf.convertToTS() 2020-07-08 09:34:35 +10:00
Audric Ackermann
2a26f4af50
trigger send of expiretimer message ongroupupdate or groupInfo 2020-07-08 09:04:06 +10:00
Maxim Shishmarev
29fe64f5d5 Fix retrieving with pubkey object 2020-07-07 18:33:40 +10:00
Maxim Shishmarev
ae35626b35
Merge pull request #1221 from msgmaxim/ts-onion-requests 
Move onion requests to typescript
 2020-07-07 16:01:19 +10:00
Mikunj Varsani
f11e0f2cd0
Merge pull request #1222 from Mikunj/blocking 
Fix up Blocking
 2020-07-07 15:51:59 +10:00
Maxim Shishmarev
ccc487528d Fix edkey extraction 2020-07-07 15:34:56 +10:00
Mikunj
f008a8b3ef Always block the primary device instead of all devices. 
Added isBlockedAsync function.
 2020-07-07 15:31:59 +10:00
Mikunj
2a1afa9fe7 Forgot checking for our own devices 2020-07-07 14:47:14 +10:00
Mikunj
3159baebfa Fix case where blocked user adds a new linked device. 2020-07-07 14:41:37 +10:00
Audric Ackermann
0366f29473
fix expiretimer on closed groups message showing on session conversation 2020-07-07 14:33:47 +10:00
Audric Ackermann
a02aa75f1f
Merge remote-tracking branch 'upstream/clearnet' into various-closed-group-fixes 2020-07-07 14:17:57 +10:00
Mikunj
1b93a210bc Comments 2020-07-07 13:46:56 +10:00
Vince
31ef6c2cfc
Merge pull request #1220 from vincentbavitz/closed-group-fixes 
Closed Group Fixes
 2020-07-07 13:35:15 +10:00
Audric Ackermann
bfd19af04d
use MultiDeviceProtocol.isOurDevice when possible 2020-07-07 13:34:36 +10:00
Audric Ackermann
15b8600e25
fix display name and avatar not being updated when message from secondary 2020-07-07 13:30:25 +10:00
Vincent
5b68ea69f7 revert activeAt position 2020-07-07 13:22:18 +10:00
Vincent
e7569a569c fix-unicode-windows-error 2020-07-07 12:37:18 +10:00
Mikunj
95f1e34b6b Update tests 2020-07-07 11:49:18 +10:00
Mikunj
8c3943094d Add tests 2020-07-07 11:42:56 +10:00
Maxim Shishmarev
6919f53a45 Move constants to preload.js 2020-07-07 11:05:04 +10:00
Mikunj
aa75205bbd Move BlockedNumberController to ts 2020-07-07 10:24:24 +10:00
Vincent
5a2b91d572 Merge branch 'various-closed-group-fixes' of https://github.com/Bilb/loki-messenger into closed-group-fixes 2020-07-07 10:23:52 +10:00
Vincent
447d2b3406 edit-loading-state 2020-07-07 10:03:04 +10:00
Maxim Shishmarev
12f73e23f2 Move onion requests to typescript 2020-07-07 09:57:52 +10:00
Vincent
4c48c9f6d6 Merge branch 'clearnet' of https://github.com/loki-project/session-desktop into closed-group-fixes 2020-07-07 09:50:08 +10:00
Vincent
2f38a4a7a3 revert primary-device-pubkey 2020-07-06 18:20:21 +10:00
Vincent
600653d3d6 allow cancel linking 2020-07-06 18:09:58 +10:00
Audric Ackermann
ed48818867
include old avatar and expireTimer on groupUpdate 2020-07-06 17:07:55 +10:00
Audric Ackermann
809b4d9461
Merge remote-tracking branch 'upstream/clearnet' into various-closed-group-fixes 2020-07-06 16:21:47 +10:00
Maxim Shishmarev
d429390e62
Merge pull request #1218 from msgmaxim/swarm-nodes 
Remove swarm nodes from conversations
 2020-07-06 16:13:57 +10:00
Audric Ackermann
235ab0bfb3
create convo for both primary and secondary in receivemessage 2020-07-06 16:08:11 +10:00
Vincent
0386259fce cancelling linked 2020-07-06 16:06:24 +10:00
Mikunj Varsani
c60dbcd3dc
Merge pull request #1217 from Bilb/fix-handle-empty-buffer-pbjs 
ignore other empty buffers which should be null after protobuf decode
 2020-07-06 16:05:45 +10:00
Maxim Shishmarev
d5a98b8b47 Remove swarm nodes from conversations 2020-07-06 15:41:52 +10:00
Vincent
6e1f3fdc75 linked-devices-limit 2020-07-06 14:19:13 +10:00
Audric Ackermann
2257420523
ignore other empty buffers which should be null after protobuf decode 2020-07-06 14:07:37 +10:00
Mikunj Varsani
26e3eca1a2
Merge pull request #1215 from Mikunj/session-restoration 
Automatically restore session on no record error
 2020-07-06 12:23:51 +10:00
Mikunj Varsani
47ba9602b0
Merge pull request #1216 from Mikunj/pairing-fix 
Fix multi device pairing
 2020-07-06 12:23:43 +10:00
Vincent
d7f8b2ccdd Merge branch 'session-restoration' of https://github.com/Mikunj/session-desktop into fix-group-name 2020-07-06 12:02:18 +10:00
Mikunj
8f82e7a442 Fix multi device pairing 2020-07-06 11:53:52 +10:00
Mikunj
f33897abe2 Automatically restore session on no record error 2020-07-06 10:38:04 +10:00
Mikunj Varsani
a3cb98c46c
Merge pull request #1213 from Mikunj/expire-timer-fix 
Fix expire timer not working in closed group
 2020-07-06 09:17:31 +10:00
Mikunj
669648d9cb Fix expire timer 2020-07-03 16:38:50 +10:00