Commit graph

3150 commits

Author SHA1 Message Date
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
Beaudan Campbell-Brown
e99cec9c09
Merge pull request #272 from Mikunj/signal-1.24
Signal 1.24
2019-05-22 14:56:37 +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
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
2019-04-17 16:42:09 +10:00
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
2019-04-17 13:47:17 +10:00
Mikunj
57195017f9 Linting 2019-04-17 12:05:30 +10:00
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
2019-04-17 11:59:54 +10:00
Beaudan Campbell-Brown
cab389fe2e
Merge pull request #267 from BeaudanBrown/move-filtering
Persistent last hash
2019-04-17 09:37:33 +10:00
Scott Nonnenberg
b31fbcaa17 Don't send if message body is too long 2019-04-16 14:35:16 -07:00
Beaudan Campbell-Brown
6a290f4918
Merge pull request #266 from Mikunj/fixes
UI Fixes
2019-04-16 13:52:59 +10:00
Beaudan
8ff647e3cd Return instead of await 2019-04-16 08:41:31 +10:00
Beaudan
e63e9b9053 Small optimisation 2019-04-15 15:27:14 +10:00
Beaudan
faf1b4b66b Lint 2019-04-15 15:27:14 +10:00
Beaudan
620380d2d9 Move filter messages to message api and some other cleaning 2019-04-15 15:27:14 +10:00
Beaudan
796181e00c Add database functions for storing, retrieving and cleaning last hash for snodes 2019-04-15 15:26:48 +10:00
Beaudan
960bd3fff2 Move JobQueue to be a module so that we can use it in preload 2019-04-15 15:26:48 +10:00
Mikunj
40ab727b12 Linting 2019-04-15 10:42:29 +10:00
Mikunj
b2ecb87462 Review fixes 2019-04-15 10:31:19 +10:00
Scott Nonnenberg
22f7a352f9 updateLastMessage: If we don't update last text, clear it 2019-04-12 14:06:34 -07:00
Mikunj
c7130a3bbb Added password confirmation dialog before showing seeds. 2019-04-12 14:48:15 +10:00
Beaudan
7eabae18f5 Replaced more references to signal with loki and updated CONTRIBUTING.md 2019-04-11 16:56:24 +10:00
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 2019-04-11 15:31:00 +10:00
Beaudan Campbell-Brown
495ddcabab
Merge pull request #262 from BeaudanBrown/millisecond-times
Ttl and timestamp milliseconds
2019-04-11 13:05:14 +10:00
Beaudan
db8f8ba36f Multiple all ttl values by 1000 and stop dividing timestamp by 1000 so they are both milliseconds 2019-04-11 10:56:17 +10:00
Beaudan
f69e6ec763 Disable encryption 2019-04-11 10:42:39 +10:00
Scott Nonnenberg
62de2a229d Add logging to track synchronization in message processing 2019-04-10 12:15:00 -07:00
Derek Meer
7727dc093e Hides the "Hide menu bar" option on MacOS (#2903)
The "Hide menu bar" option is only applicable to Windows and some Linux distros,
where the menu bar is attached to the Signal window. Therefore, this commit
ensures that it doesn't show up on MacOS. It includes a setting,
isHideMenuBarSupported(), to control the option's appearance. This
commit also includes the tests to make sure isHideMenuBarSupported()
works correctly.

Fixes #2705
2019-04-08 10:25:14 -07:00
Beaudan
f076f94e71 Clearer last hash line 2019-04-08 13:39:04 +10:00
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 2019-04-08 13:37:20 +10:00
Beaudan
0f771d4db4 Rename loki_fetch to loki_rpc 2019-04-08 13:37:20 +10:00
Beaudan
b09f2970fc Move NotFoundError to errors.js 2019-04-08 13:37:20 +10:00
Beaudan
929d272fcc Fixed bugs with http being appended at wrong time and lastHash not being sent properly 2019-04-08 13:37:20 +10:00
Beaudan
531ee92dcb Updated messenger to work with slightly different storage server API and changed swarm requests to go through storage server 2019-04-08 13:37:20 +10:00
Scott Nonnenberg
629dc8737b Fix issue where 'delete messages' was not clickable second time 2019-04-05 17:18:37 -07:00