Commit Graph

995 Commits (a64df1c91cce68f389d710a571a7708ea39bb6df)

Author SHA1 Message Date
Beaudan Brown a1921cfff3 Enable link previews to be sent as attachments, might need some more tweaking 6 years ago
Beaudan Brown c7a91686a8 Update proto id and use the server id as the attachmentpointer id 6 years ago
Beaudan Brown 5710c1268c Revert id field and add new url field to be compatible with mobile 6 years ago
Beaudan Brown 4e85435bf7 Update attachment pipeline to upload and download from loki fileserver 6 years ago
sachaaaaa 73d90a5277
Merge pull request #537 from sachaaaaa/secondary_device_minimum_receiver
[multi-device] Start all the receivers only after the secondary registration is fini…
6 years ago
sachaaaaa c38e145be7 lint 6 years ago
sachaaaaa f268fbb552
Merge pull request #534 from sachaaaaa/use_file_server_device_mapping
[multi-device] Use file server device mapping
6 years ago
sachaaaaa cc04bee38a Start all the receivers only after the secondary registration is finished 6 years ago
sachaaaaa 91a79ea57c Fetch device mapping from server when after receiving friend request 6 years ago
sachaaaaa a314721cce Both devices to update their mapping after secondary registration 6 years ago
sachaaaaa 4929f8d8db Move high-level authorisation from message_receivier to libloki.crypto 6 years ago
sachaaaaa 77bfee8892 No need to handle authorisations sent in friend requests 6 years ago
sachaaaaa d5ddc1c536 No need to attach authorisation with every friend request 6 years ago
sachaaaaa b63d8ec84f Merge branch 'clearnet' into multi-device
* clearnet: (35 commits)
  yarn lint
  return early if signature is not a string
  lint pass 2
  lint pass 1
  make sure versioning on write can't get out of sync
  Update js/modules/loki_public_chat_api.js
  Handle annotations omit correctly
  fix typo CI found
  refactor
  pollOnceForMessages() move lastGot up, address Sacha's review
  Update js/modules/loki_public_chat_api.js
  address review
  address reviews
  Custom message rendering of mentions
  fix method
  separate out new/open, more lint/cleanup
  separate out note to self
  create window.mixpanel here
  use window.mixpanel, remove eventEmitter
  lint and remove unneeded params
  ...
6 years ago
Ryan Tharp c921d3e3b3 allow mixpanel to be already set up elsewhere 6 years ago
Ryan Tharp 88b44390bf Desktop Analytics 6 years ago
sachaaaaa d3653e8665 lint after manual merge 6 years ago
sachaaaaa 0426d85e7a Merge branch 'clearnet' into multi-device
* clearnet: (136 commits)
  Fix more check on deletion.
  Only shorten pubkeys if name is present
  Shorten pubkeys in quotations too
  better guard
  pass serverId back to the server
  Bump version.
  Purge cache on failure.
  Fix unnecessary link preview fetches.
  Review changes. Increase mod time to 30 seconds.
  Undo defaultPublicChatServer change,
  Modified colour of dark mod badge
  Linting.
  Updated design
  Show crown icon for moderators
  Fix last hash all being NULL in database
  Poll for moderators, store them on the conversation and use the list to determine our own mod status
  Make sure we are always updating the last deleted id
  Update ts/components/conversation/FriendRequest.md
  Fix #355 Display timestamp for friend requests
  Fix duplicate detection for sent messages in public chat
  ...

# Conflicts:
#	app/sql.js
#	js/background.js
#	js/models/messages.js
#	js/views/app_view.js
#	libloki/crypto.js
#	libtextsecure/message_receiver.js
6 years ago
sachaaaaa d17f86679f
Merge pull request #495 from sachaaaaa/fix_unknown_signedkey
[multi-device] Ensure the latest contact signed prekey is used
6 years ago
sachaaaaa 712afef8e2 simplify 6 years ago
sachaaaaa 6de6b762e6 Ensure the latest contact signed prekey is used 6 years ago
sachaaaaa cf0628a001 Secondary device to send friend request automatically to all sync contact received 6 years ago
sachaaaaa b10835ffc7 Share contact upon authorising secondary device 6 years ago
Beaudan Brown 9beea2cbd3 Enforce curlies completely and lint with new settings 6 years ago
Beaudan Campbell-Brown a6abcaf826
Merge pull request #453 from Mikunj/profile-simplification
Profile simplification
6 years ago
Beaudan Campbell-Brown 43bd167965
Merge pull request #463 from loki-project/public-chat
Public chat
6 years ago
Mikunj 831ae09576 Cherry pick "profile simplification" from Mik 6 years ago
sachaaaaa 1ea934d69c
Merge pull request #457 from sachaaaaa/share_profile_name
[multi-device] Share primary device profile name upon secondary registration
6 years ago
sachaaaaa 9f8ee875b7 address review 6 years ago
sachaaaaa 97970ff465 Share primary device profile name upon secondary registration 6 years ago
sachaaaaa 7b9e578d8a lint 6 years ago
sachaaaaa aa2438ad00 Shorter TTL for pairing requests 6 years ago
Mikunj c4dd10a5cd Simplified profile setting. Renamed functions to be less confusing. Removed storing profile in local storage. 6 years ago
Beaudan Brown 700ed5d2a8 Some refactoring from reviews, and include the token in the message pipeline instead of getting in message_api 6 years ago
Beaudan Brown b5fd01a468 Add required metadata to sending pipeline and send to public channels 6 years ago
sachaaaaa 1d4c98adf0
Merge pull request #444 from sachaaaaa/logic_fixes
[multi-device] Fix bugs revealed during reviews
6 years ago
Beaudan Brown eec4f22b50 Add crypto helpers and public error 6 years ago
sachaaaaa bb0150624f Address reviews 6 years ago
sachaaaaa 661b207245 Various fixes for bugs introduced during reviews 6 years ago
sachaaaaa 53b974d63f Send messages to every devices linked to a primary device 6 years ago
sachaaaaa 5eab2098b6
Merge pull request #430 from sachaaaaa/handle_incoming_authorisation
[multi-device] Handle incoming pairing authorisation message
6 years ago
sachaaaaa 8ef54890b2
Update libtextsecure/message_receiver.js
Co-Authored-By: Mikunj Varsani <Mikunj@users.noreply.github.com>
6 years ago
sachaaaaa c7dc79e7f9 Fix missing awaits! 6 years ago
sachaaaaa 6ab05e28df Handle incoming pairing authorisation message 6 years ago
sachaaaaa 794e6416c8 Add requestPairing high-level function 6 years ago
Beaudan Brown 895cedc801 Lint 6 years ago
sachaaaaa 713e9a3acf Fix pubkey validation 6 years ago
Beaudan Brown 3f4b94ba74 Transition to initialising rss feeds in schema update 6 years ago
Ryan Tharp 48f2637ff9 lint 6 years ago
Ryan Tharp 0a1655b03d poll all feeds 6 years ago
Ryan Tharp c57571fdfd loki.network rss feed 6 years ago
sachaaaaa edd800d382 Make linter happy 6 years ago
sachaaaaa bf8bb23683 remove stale comment and simplify conversation creation 6 years ago
sachaaaaa d208614909 Multi-device part 1: make primary account generate and send authorisation to secondary 6 years ago
Beaudan f857744e88 Revert sending id 6 years ago
Beaudan f718bf15d2 Prepare to delete message, send message id to server 6 years ago
Beaudan 21f0149e22 Send profile and update it 6 years ago
Beaudan 014558d939 Squash and clean of old PRs, move towards sending cleartext again 6 years ago
sachaaaaa 0e61ab8ccc Better document magic numbers 6 years ago
sachaaaaa 16e51a2c7a use variable for magic number 6 years ago
sachaaaaa b15799e7cb Generate 13 word seeds by default - still accept 25 word seeds. 6 years ago
Beaudan 7dd155eb16 Remove empty event trigger, doesn't seem to be required any more but could be wrong 6 years ago
Beaudan Campbell-Brown b76f84acc5
Merge pull request #377 from msgmaxim/typing-indicators
Add a toggle option for typing indicators; use short ttl for them
6 years ago
Maxim Shishmarev cdd374a4b2 Add a toggle option for typing indicators; use short ttl for them 6 years ago
Beaudan Campbell-Brown 0e9372d3d5
Merge pull request #373 from msgmaxim/timestamp-error
Show correct error on incorrect timestamp
6 years ago
Maxim Shishmarev 09d279dd93 Show correct error on incorrect timestamp 6 years ago
Beaudan 63396669bc Add eslint rule to enforce curlys, run eslint --fix to automatically apply this rule and add swapfiles to gitignore 6 years ago
Beaudan Campbell-Brown c1efa93137
Merge pull request #349 from BeaudanBrown/fix-disappearing
Fix disappearing messages and deleting contact
6 years ago
Beaudan 96aaa7851d Send broadcast message instead of empty message to trigger things like session reset and disappearing messages. Also fix small bug where deleting a contact kept the (now removed) conversation open 6 years ago
Beaudan 6ef94fa43d Start attempt at closing long polling connections when offline event is triggered 6 years ago
Beaudan 804fc076cc Refresh swarm list 1 time for outgoing messages 6 years ago
Beaudan df2c4af67c Run lint and check for ip or address when removing unreachable nodes 6 years ago
sachaaaaa beac7a02bb send "unreachable" ping to allow half-p2p 6 years ago
sachaaaaa c53633e367 Clearnet p2p with https (no verification yet) 6 years ago
Beaudan d82b5e1998 Remove random snodes if they fail and then try again. Throw seed node error if getRandomSnodeAddress fails. Filter out 0.0.0.0 nodes. 6 years ago
Beaudan e520bf109a Persist PoW difficulty and update if get response from snodes 6 years ago
Beaudan Campbell-Brown e9b1359bab
Merge pull request #295 from BeaudanBrown/refactor-sendmessage
Refactor sendmessage
6 years ago
Beaudan Campbell-Brown fd6f6c6a8c
Merge pull request #290 from Mikunj/loki-profile
Convert profile field in DataMessage to use LokiProfile
6 years ago
Beaudan c02d5d4053 Lint 6 years ago
Beaudan 709db4bf54 Make sendMessage take options, remove redundant retrieve function and get constant 6 years ago
Beaudan b43978ece1 Initial refactoring of sendmessage 6 years ago
Beaudan Campbell-Brown fbcd49ac5d
Merge pull request #270 from sachaaaaa/concurrent_polling
Refactor long polling for better concurrent requests
6 years ago
Mikunj 2c12c8a1d8 Convert profile field in data message to use LokiProfile instead of signal Contact. 6 years ago
sachaaaaa 5f77f751d9 Replace generator function and other various fixes 6 years ago
sachaaaaa 09a9cfbf37 Refactor long polling for better concurrent requests 6 years ago
Beaudan 91e218766c Remove old log 6 years ago
Beaudan Campbell-Brown e99cec9c09
Merge pull request #272 from Mikunj/signal-1.24
Signal 1.24
6 years ago
beaudan 145b9e0a37 Fix typo 6 years ago
beaudan 6f21e7244f Print polling error 6 years ago
beaudan 54bd75e9a6 Wait for a longer time after failed poll and extend default timeout 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 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 620380d2d9 Move filter messages to message api and some other cleaning 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 db8f8ba36f Multiple all ttl values by 1000 and stop dividing timestamp by 1000 so they are both milliseconds 6 years ago
Scott Nonnenberg a450cdf528 Lint fixes for recent PRs 6 years ago