Mikunj
|
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 |
|
Mikunj
|
57195017f9
|
Linting
|
6 years ago |
|
Mikunj
|
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 |
Beaudan Campbell-Brown
|
cab389fe2e
|
Merge pull request #267 from BeaudanBrown/move-filtering
Persistent last hash
|
6 years ago |
|
Beaudan Campbell-Brown
|
6a290f4918
|
Merge pull request #266 from Mikunj/fixes
UI Fixes
|
6 years ago |
|
Beaudan
|
8ff647e3cd
|
Return instead of await
|
6 years ago |
|
Beaudan
|
e63e9b9053
|
Small optimisation
|
6 years ago |
|
Beaudan
|
faf1b4b66b
|
Lint
|
6 years ago |
|
Beaudan
|
620380d2d9
|
Move filter messages to message api and some other cleaning
|
6 years ago |
|
Beaudan
|
796181e00c
|
Add database functions for storing, retrieving and cleaning last hash for snodes
|
6 years ago |
|
Beaudan
|
960bd3fff2
|
Move JobQueue to be a module so that we can use it in preload
|
6 years ago |
|
Mikunj
|
40ab727b12
|
Linting
|
6 years ago |
|
Mikunj
|
b2ecb87462
|
Review fixes
|
6 years ago |
|
Mikunj
|
c7130a3bbb
|
Added password confirmation dialog before showing seeds.
|
6 years ago |
|
Beaudan
|
377e90bafe
|
Include long polling header for retrieve messages, extend retrieveMessages timeout to 40 seconds, reduce default tmeout to 5 seconds, remove dev/prod poll time difference
|
6 years ago |
|
Beaudan Campbell-Brown
|
495ddcabab
|
Merge pull request #262 from BeaudanBrown/millisecond-times
Ttl and timestamp milliseconds
|
6 years ago |
|
Beaudan
|
db8f8ba36f
|
Multiple all ttl values by 1000 and stop dividing timestamp by 1000 so they are both milliseconds
|
6 years ago |
|
Beaudan
|
f69e6ec763
|
Disable encryption
|
6 years ago |
|
Beaudan
|
f076f94e71
|
Clearer last hash line
|
6 years ago |
|
Beaudan
|
fa7042c043
|
Added wrong swarm error which gets thrown if we receive a 421 error, update the swarm lists if we get one of those errors
|
6 years ago |
|
Beaudan
|
0f771d4db4
|
Rename loki_fetch to loki_rpc
|
6 years ago |
|
Beaudan
|
b09f2970fc
|
Move NotFoundError to errors.js
|
6 years ago |
|
Beaudan
|
929d272fcc
|
Fixed bugs with http being appended at wrong time and lastHash not being sent properly
|
6 years ago |
|
Beaudan
|
531ee92dcb
|
Updated messenger to work with slightly different storage server API and changed swarm requests to go through storage server
|
6 years ago |
|
Mikunj
|
ae8b3899ad
|
Changed registration to be a 2 step process.
|
6 years ago |
|
Beaudan Campbell-Brown
|
338f4e3682
|
Merge pull request #255 from BeaudanBrown/better-logs
Improve sending/retrieving/swarm logs
|
6 years ago |
|
Beaudan Campbell-Brown
|
ce2d5d169f
|
Merge pull request #253 from BeaudanBrown/extend-right-click
Extend right click functionality
|
6 years ago |
|
Beaudan
|
0b6849c96a
|
Review comment plus added a todo
|
6 years ago |
|
Beaudan
|
6656a89092
|
Cleaned up a lot of the logs, stop them from printing more than once etc
|
6 years ago |
Scott Nonnenberg
|
bf904ddd12
|
On attachment save include date, include album index
|
6 years ago |
|
Scott Nonnenberg
|
782516186f
|
Move expiring message cleanup after ConversationController.load()
|
6 years ago |
|
Scott Nonnenberg
|
e68367fe0d
|
Remove reference to nonexistent view
|
6 years ago |
|
Scott Nonnenberg
|
009c58749b
|
Don't continue to log if socket is returning unknown status
|
6 years ago |
|
Scott Nonnenberg
|
812f895e12
|
Bring lastMessage and lastMessageStatus back to conversation
|
6 years ago |
|
Scott Nonnenberg
|
dcd16775c3
|
Note to Self: set expirationStartTimestamp before sending sync
|
6 years ago |
|
Scott Nonnenberg
|
eb7ad48951
|
Only put nbsp before last token in msg body if token is <12 chars
|
6 years ago |
|
Scott Nonnenberg
|
ba501a6df6
|
Fix ASM warnings in MP3 library
|
6 years ago |
|
Scott Nonnenberg
|
fbda313d09
|
Add job details to attachment download log warning
|
6 years ago |
|
Scott Nonnenberg
|
ae161c6cf6
|
Update to Electron 4.x
|
6 years ago |
|
Scott Nonnenberg
|
667b2e63f1
|
Ensure image lightbox is aware of its underlying message changes
|
6 years ago |
|
Scott Nonnenberg
|
ae2db9f09a
|
Improve handling for URLs composed of mixed character sets
|
6 years ago |
|
Beaudan
|
dbdde07062
|
Allow conversation symbol to generate while swarm nodes are being retrieved
|
6 years ago |
|
Beaudan
|
9717267b00
|
Review
|
6 years ago |
|
Beaudan
|
14367620d9
|
lint
|
6 years ago |
|
Beaudan
|
d0d57ea8c7
|
Add more functionality to the conversation right click menu, add right click for messages, change some of the ways toasts/confirmation dialogs are created, auto focus text input for nickname, clean up some stuff
|
6 years ago |
|
Beaudan
|
5c29c6cb1d
|
Search view now works with deleting contacts as well
|
6 years ago |
|
Beaudan
|
df93c97b48
|
Added ability to delete contacts and destroy all sessions with them. Added right click menu to contacts/conversations in list which can block, delete messages and delete contact
|
6 years ago |
sachaaaaa
|
dca2462f6c
|
Merge pull request #248 from sachaaaaa/friend_request_expiry
Add requestExpired state to Friend Request state machine
|
6 years ago |
sachaaaaa
|
77fb5b4a71
|
Missing closing parenthesis
|
6 years ago |
Mikunj Varsani
|
353302ca16
|
Use Array.includes instead of Array.indexOf
Co-Authored-By: sachaaaaa <40749766+sachaaaaa@users.noreply.github.com>
|
6 years ago |