Commit Graph

440 Commits (986d34bbd93e104e72bebbad921609c78865acc1)

Author SHA1 Message Date
Mikunj 986d34bbd9 linting 6 years ago
Mikunj d4de4b13dd Fix incorrect import. 6 years ago
Mikunj b4390a8c95 Updated pinging logic. 6 years ago
Beaudan Campbell-Brown e99cec9c09
Merge pull request #272 from Mikunj/signal-1.24
Signal 1.24
6 years ago
beaudan 54bd75e9a6 Wait for a longer time after failed poll and extend default timeout 6 years ago
Mikunj fbbf454c49 Merge branch 'development' into signal-1.24 6 years ago
Beaudan Campbell-Brown 318371a652
Merge pull request #264 from BeaudanBrown/remove-signal-references
Remove Signal references
6 years ago
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
6 years ago
Mikunj 3a8111020e Merge v1.23.0
# Conflicts:
#	background.html
#	package.json
#	yarn.lock
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 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 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
Beaudan 7eabae18f5 Replaced more references to signal with loki and updated CONTRIBUTING.md 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
Scott Nonnenberg 74cb808763 New MessageController as the single place for in-memory messages 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
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 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 ae2db9f09a Improve handling for URLs composed of mixed character sets 6 years ago
Beaudan Campbell-Brown 8e3542b511
Merge pull request #213 from sachaaaaa/channel_encryption
Hook up channel encryption
6 years ago
Beaudan 8c20a31dd4 Review suggestions 6 years ago
sachaaaaa 53b0574a1f Merge branch 'development' into channel_encryption
* development:
  Manually set the dns servers for windows
  Refactor local_loki_server
  Refactor rpc calls to its own function.

# Conflicts:
#	js/modules/loki_message_api.js
6 years ago
sachaaaaa 55e0ff1a88
Merge pull request #208 from Mikunj/message-api-refactor
Refactor rpc call to its own function.
6 years ago
sachaaaaa ad5efc9ba3 lint 6 years ago
sachaaaaa aa722590fa use channel encryption with storage server 6 years ago
Beaudan 72d00e0922 Manually set the dns servers for windows 6 years ago
Mikunj 4a037387e9 Refactor rpc calls to its own function. 6 years ago
Mikunj 06be1da40d Added p2p message styling 6 years ago
Beaudan c0a6ba25bc Update p2p messages to follow the same endpoint format as storage server. Clean up message_api a lil bit and updated tests 6 years ago
Beaudan 08dee14802 Review comment 6 years ago
Scott Nonnenberg 3917ab940e web_api: Fix caching of https.agent objects between requests 6 years ago