Mikunj
3152f92e30
Merge signal 1.23.2
...
# Conflicts:
# app/sql.js
# js/conversation_controller.js
# package.json
6 years ago
Mikunj
3a8111020e
Merge v1.23.0
...
# Conflicts:
# background.html
# package.json
# yarn.lock
6 years ago
Scott Nonnenberg
ef670bec3f
Ensure that we have all conversations in redux store
6 years ago
Mikunj
7387e88c97
Add showing friends in search.
6 years ago
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
6 years ago
Mikunj
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
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
Scott Nonnenberg
0c69d725c3
Ensure that we have all conversations in redux store
6 years ago
Beaudan Campbell-Brown
338f4e3682
Merge pull request #255 from BeaudanBrown/better-logs
...
Improve sending/retrieving/swarm logs
6 years ago
Scott Nonnenberg
b232d6289a
Update react-contextmenu to avoid event handler issues un unload
6 years ago
Scott Nonnenberg
3b140d9b51
Update react-contextmenu to avoid event handler issues un unload
6 years ago
Scott Nonnenberg
7cfd3870d5
Escape XML delimiters for notifications on linux
...
Thanks to @whitequark for pointing out an inconsistency in the way that
some Linux desktop environments were displaying markup in notifications.
6 years ago
Scott Nonnenberg
8c4d90df07
Send long text as an attachment instead of inline
...
Remove Android length warning
Handle incoming long message attachments
Show long download pending status in message bubble
Fix the width of the smallest spinner
Remove Android length warning from HTML templates
6 years ago
Scott Nonnenberg
0e5f405b53
Remove unnecessary 'tag' from Notification construction
6 years ago
Beaudan Campbell-Brown
ce2d5d169f
Merge pull request #253 from BeaudanBrown/extend-right-click
...
Extend right click functionality
6 years ago
Scott Nonnenberg
32fa5cccde
Send sync sent messages properly in 1-member group
6 years ago
Scott Nonnenberg
c76d537482
Note to Self: On just expire timer update, set TIMER_UPDATE flag
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
b3ac1373fa
Move left pane entirely to React
6 years ago
Scott Nonnenberg
bf904ddd12
On attachment save include date, include album index
6 years ago
Scott Nonnenberg
768007a269
Message Detail: Ensure that quotes are not clickable
6 years ago
Scott Nonnenberg
6ffbc0ac06
Archive Conversation
6 years ago
Scott Nonnenberg
782516186f
Move expiring message cleanup after ConversationController.load()
6 years ago
Scott Nonnenberg
d72f89d776
Render only visible conversations in left pane
6 years ago
Scott Nonnenberg
e68367fe0d
Remove reference to nonexistent view
6 years ago