Mikunj
|
4d3fb17e61
|
Merge branch 'sig-development' into merge/signal
|
7 years ago |
sachaaaaa
|
6c6b0a4b92
|
Merge pull request #37 from sachaaaaa/fix_network_status_warning
Make network status warning work with HTTP polling
|
7 years ago |
|
sachaaaaa
|
5bcf63e592
|
Merge pull request #39 from BeaudanBrown/last-hash
Last hash
|
7 years ago |
|
sachaaaaa
|
19e664bf38
|
Merge pull request #38 from Mikunj/fix/duplicate-messages
[Pending] Fix duplicate messages
|
7 years ago |
Beaudan
|
9731c9e086
|
Comment out some signal server based code causing errors. Return before trying to unpad message because they aren't being padded in the first place
|
7 years ago |
|
Beaudan
|
3aa135fdb4
|
Grabbing last hash from server response. only requesting messages after the lasthash. Keeping track of lasthash for array of nodes (currently hardcoded for one)
|
7 years ago |
|
Mikunj
|
245ae721c7
|
Fix checking for when a friend request was accepted.
|
7 years ago |
|
Mikunj
|
3389b1d457
|
Fixed the way preKeyBundle is stored in message.
|
7 years ago |
|
Mikunj
|
688f275262
|
pass in source, sourceDevice, timestamp and receivedAt when adding a friend request.
|
7 years ago |
sachaaaaa
|
7e9016f510
|
Make network status warning work with HTTP polling
|
7 years ago |
|
sachaaaaa
|
cb46dd3adb
|
Merge pull request #36 from Mikunj/fix/multi-instance
Clean up multi instance code.
|
7 years ago |
|
Mikunj
|
e2a48b8373
|
Clean up multi instance code.
|
7 years ago |
BeaudanBrown
|
bd0ce981dd
|
Merge pull request #34 from sachaaaaa/classify
ES2015 classes for LokiServer and FallBackSessionCipher
|
7 years ago |
|
sachaaaaa
|
2af2baa54a
|
Merge pull request #35 from sachaaaaa/multi-window
Allow multiple instances running for debugging
|
7 years ago |
|
sachaaaaa
|
d41b2594dd
|
Merge pull request #33 from Mikunj/feature/friend-request
Friend request redesign inside the conversation view
|
7 years ago |
|
Mikunj
|
33ee45b819
|
Cleaned up SQL for getMessagesByConversation.
|
7 years ago |
|
Mikunj
|
f2dbdff548
|
code cleanup.
|
7 years ago |
|
sachaaaaa
|
f9efd0da68
|
allow multiple instances running for debugging
|
7 years ago |
|
Mikunj
|
dc1e42a2e4
|
Removed unneeded comment :)
|
7 years ago |
|
Mikunj
|
1150f0f915
|
Allow fetching conversation messages by a specific type.
|
7 years ago |
|
sachaaaaa
|
ad1cf94526
|
ES2015 classes for LokiServer and FallBackSessionCipher
|
7 years ago |
|
Mikunj
|
4b7a94c7d0
|
Merge branch 'development' into feature/friend-request
|
7 years ago |
|
Mikunj
|
f4b60c3ff6
|
Fix setting friend requests incorrectly.
|
7 years ago |
|
Beaudan
|
d6534e1bb8
|
Fixed bug with signed key sig not being saved
|
7 years ago |
|
Mikunj
|
5e48efc935
|
Merge commit 'd94365f1c6dbb315f67f29b47982b5f24bd11f5f' into feature/friend-request
|
7 years ago |
|
Mikunj
|
557fed11f3
|
Only display retry send button if the request is pending.
|
7 years ago |
|
Mikunj
|
6aab900da2
|
Handle friend request updated.
|
7 years ago |
|
Mikunj
|
4d08a74d53
|
Updated FriendRequest to be more consistent with the other typescript components.
|
7 years ago |
|
Mikunj
|
f45e0030c4
|
Added status display and retry send to friend request.
|
7 years ago |
|
Mikunj
|
7530836110
|
Send message status in friend request props.
|
7 years ago |
|
Mikunj
|
757216fe80
|
Fix text input disabling.
|
7 years ago |
|
Mikunj
|
2a83c8710c
|
Fix up sending friend requests.
|
7 years ago |
|
Mikunj
|
fc3cb9c46d
|
Replace old pending messages with new one when adding a new incoming friend request.
More refactoring.
|
7 years ago |
|
Mikunj
|
d5fafd4d78
|
refactor friend request message props
|
7 years ago |
|
Mikunj
|
a80d6bb868
|
Merged branch correctly.
|
7 years ago |
|
BeaudanBrown
|
d94365f1c6
|
Merge pull request #30 from sachaaaaa/fix_enum_clash
change FRIEND_REQUEST value to prevent clash with upstream
|
7 years ago |
|
BeaudanBrown
|
61d3c3244c
|
Merge pull request #32 from sachaaaaa/disable_signal_stuff
Comment out signal-specific logic introduced in latest merge
|
7 years ago |
|
sachaaaaa
|
2451ffdca4
|
Comment out signal-specific logic introduced in latest merge
|
7 years ago |
Scott Nonnenberg
|
7d54f7928d
|
v1.18.0-beta.7
|
7 years ago |
Mikunj Varsani
|
e4d28fbcb8
|
Merge pull request #31 from Mikunj/fix/minor-bug
Fixed incorrect variable used.
|
7 years ago |
|
Mikunj
|
40fb7f726f
|
Fixed incorrect variable used.
|
7 years ago |
|
Scott Nonnenberg
|
4610b63fb7
|
Lint fixes
|
7 years ago |
|
sachaaaaa
|
c605fff58d
|
change FRIEND_REQUEST value to prevent clash with upstream
|
7 years ago |
|
sachaaaaa
|
7887786b00
|
Merge pull request #29 from BeaudanBrown/message-polling
Message server is polled every 5 seconds to check for new messages
|
7 years ago |
|
BeaudanBrown
|
9ceb3c8ac0
|
Merge branch 'development' into message-polling
|
7 years ago |
|
sachaaaaa
|
5c93acffe1
|
Merge pull request #27 from Mikunj/merge/signal
Merge new signal changes
|
7 years ago |
|
Scott Nonnenberg
|
ecf3f18762
|
Improve our deletion of IndexedDB post-SQLCipher migration
|
7 years ago |
|
Scott Nonnenberg
|
6300256a3e
|
Gracefully shut down database operations before app exit
|
7 years ago |
|
Scott Nonnenberg
|
2822f4ce40
|
Ensure proper order of state changes during account create
|
7 years ago |
|
Scott Nonnenberg
|
c5f9fae444
|
A few small bugfixes
|
7 years ago |