Commit Graph

718 Commits (2b7af04587866aff1f898393c723e2a3a47a3dd1)

Author SHA1 Message Date
Maxim Shishmarev 5a08ac9cc1 Use avatar specific endpoint 6 years ago
sachaaaaa 6471c3698f Fix errors showing up from invalid public chats 6 years ago
Maxim Shishmarev 4dd314c18f Enable profile pictures 6 years ago
Beaudan Brown 685ada5cc5 Merge branch 'clearnet' into prep-merge 6 years ago
Ryan Tharp c40fe1dc79 reduce branching depth, prefer reduce over forEach, add comments, lint, dead code removal 6 years ago
Ryan Tharp d1526b9997 diable checkSigs, use libloki.crypto.validateAuthorisation, lint, remove dead code 6 years ago
Beaudan Brown ac762d43d5 Reduce indentation and simplify code by using existing verification functions 6 years ago
Ryan Tharp cad9a89636 verifyUserObjectDeviceMap removed notFoundHandler from prototype/reduced branching depth/returns users pub keys not found 6 years ago
Ryan Tharp 60cefc7fe1 improve comments 6 years ago
sachaaaaa 2b6bd7e04a
Merge pull request #612 from sachaaaaa/timeout_fix
Fix recurring memory leak in mentions
6 years ago
Ryan Tharp 0b05753fec use renamed getUsers 6 years ago
Ryan Tharp 1a59ef5f92 rename getUsersAnnotations => getUsers 6 years ago
Ryan Tharp eab53e158e Merge branch 'multi-device' of https://github.com/loki-project/loki-messenger into multidevice-publicchat 6 years ago
sachaaaaa c9e3757381 dial the logging down a notch 6 years ago
sachaaaaa 2c1375e42a Fix recurring memory leak in mentions 6 years ago
Maxim Shishmarev 7c96990119 Correctly handle server errors in multi-deletion 6 years ago
Maxim Shishmarev 8677fb15a0 Select multiple messages and bulk deletion 6 years ago
Maxim Shishmarev 395daf3aba Use Array.includes in place of Array.indexOf 6 years ago
Maxim Shishmarev 7c05939f55 Add group admins and the ability to remove members from private groups 6 years ago
Maxim Shishmarev 9f81f67460 Can leave private group chats 6 years ago
Maxim Shishmarev cf18572049 Adding new group members; establishing sessions between non-friends 6 years ago
Maxim Shishmarev 0d19b708f9 Creating private group chats between friends 6 years ago
Beaudan Brown d97eced37b Merge branch 'clearnet' into multi-device 6 years ago
Beaudan Brown a3635216db Enable sending audio recordings 6 years ago
Beaudan Brown 221c6b53b1 Clean up a bit 6 years ago
Beaudan Brown 8cf90ae85d Use message timestamp for empty messages 6 years ago
Beaudan Brown 638f1c0e6c Bringing together all the stuff for attachments and link previews 6 years ago
Beaudan Brown 9114a3bc03 Annotation conversations 6 years ago
Beaudan Brown f0c198c7b7 Split uploadData to public and private 6 years ago
Beaudan Campbell-Brown ac80ef0d4e
Merge pull request #557 from BeaudanBrown/add-server
Add server
6 years ago
Beaudan Brown c7a91686a8 Update proto id and use the server id as the attachmentpointer id 6 years ago
Beaudan Brown 4e85435bf7 Update attachment pipeline to upload and download from loki fileserver 6 years ago
Beaudan Brown 363cd81ccc Hook up UI to all the server creation logic etc 6 years ago
Beaudan Brown 4e70b66131 Extract the async token grab from the server api constructor and put in the factory. Fix up the areas this affects 6 years ago
Beaudan Brown 5d2f7ddb20 Add messages needed for UI, bit of house work 6 years ago
Beaudan Brown 9ed3ec5dec Fix linting 6 years ago
Beaudan Brown 399c54452e Default user name to anonymouse if they don't have one set 6 years ago
Beaudan Brown f9f7a799b5 Updating signature scheme to use hard coded fields 6 years ago
Ryan Tharp d432e2a77b verifyUserObjectDeviceMap() and refactor out verifyPrimaryPubKeys() 6 years ago
Ryan Tharp 7f433f3df0 move file server related functions into file server, make multidevice states global 6 years ago
Ryan Tharp 206d29b033 avoid no pubkey with guards, make sure primary and secondary authorization match 6 years ago
Ryan Tharp 9ba641c8c1 signature checking, hide your own message, addres potential race issues 6 years ago
Ryan Tharp 87474d48b5 fix async problem with receive forEach, implement most of the annotation processing for multidevice 6 years ago
Ryan Tharp 7b22806bf0 Merge branch 'multi-device' of https://github.com/loki-project/loki-messenger into multidevice-publicchat 6 years ago
sachaaaaa 1f3311bc5d Save device mappings upon accepting friend request + various fixes 6 years ago
sachaaaaa 48ce9a7649 lint 6 years ago
sachaaaaa 03d0385427 Fix signatures being sent to file server as arraybuffer 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
Ryan Tharp 468550cbdf getDeviceMappingForUsers() 6 years ago
Ryan Tharp ddde675ba8 stub out multidevice support, move token validation into server class 6 years ago
sachaaaaa c38e145be7 lint 6 years ago
sachaaaaa 634d274ffc
Merge pull request #531 from sachaaaaa/remove_all_private_conv
[multi-device] Remove private convs only
6 years ago
sachaaaaa cc04bee38a Start all the receivers only after the secondary registration is finished 6 years ago
sachaaaaa 8ce21b13fe Remove only private conversation during secondary registrations steps to keep public chats in db 6 years ago
sachaaaaa de6e4e4920 Add updateOurDeviceMapping that wraps setOurDeviceMapping 6 years ago
sachaaaaa 5a8ab00a96 Rename pairing getters to specify secondary or primary. Add getGrantAuthForPrimary. 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
sachaaaaa 7549c45716 yarn lint 6 years ago
sachaaaaa a28c581666 return early if signature is not a string 6 years ago
sachaaaaa a931b2491a Merge branch 'clearnet' into PR_file_server
* clearnet:
  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 reviews
  Custom message rendering of mentions
  lint and remove unneeded params
  modernize annotations since we're making a backward-incomp change
  sign and only show verified messages

# Conflicts:
#	js/modules/loki_public_chat_api.js
6 years ago
sachaaaaa 035c48eb12
Merge pull request #517 from neuroscr/publicchat_signed
sign and only show verified public chat messages
6 years ago
Ryan Tharp 34b7117ff7
lint pass 2 6 years ago
Ryan Tharp 8bfb7f297d
lint pass 1 6 years ago
sachaaaaa b13a4f3e56
Merge pull request #520 from msgmaxim/mentions2
Custom message rendering of mentions
6 years ago
Ryan Tharp 6ac6d656a4
make sure versioning on write can't get out of sync 6 years ago
Ryan Tharp ab440a699f
Update js/modules/loki_public_chat_api.js
Co-Authored-By: sachaaaaa <40749766+sachaaaaa@users.noreply.github.com>
6 years ago
Ryan Tharp a976388315
Handle annotations omit correctly 6 years ago
Ryan Tharp b62801bc2a
fix typo CI found 6 years ago
Ryan Tharp 968ad9227c
refactor
pls forgive, using github editor for expedience, untested changes
6 years ago
Ryan Tharp c8cf05558f
pollOnceForMessages() move lastGot up, address Sacha's review 6 years ago
Ryan Tharp d85cd980c2
Update js/modules/loki_public_chat_api.js
oof

Co-Authored-By: sachaaaaa <40749766+sachaaaaa@users.noreply.github.com>
6 years ago
sachaaaaa e2e2d1e845 address review 6 years ago
sachaaaaa 7756d4f0f3 Merge branch 'clearnet' into PR_file_server
* clearnet:
  fix method
  separate out new/open, more lint/cleanup
  separate out note to self
  create window.mixpanel here
  use window.mixpanel, remove eventEmitter
  allow mixpanel to be already set up elsewhere
  Address review comments
  Add missing file in tests
  Add UI elements for searching and selecting members in a group chat
  Desktop Analytics
  Replaced value with a descriptive constant.
  Add comment to fix up confusion.
  Keep a cache of the last 5 fetched messages for public chat so we can use it to detect duplicate messages.

# Conflicts:
#	js/background.js
#	js/modules/loki_public_chat_api.js
6 years ago
Ryan Tharp 71fde0b9e6
Merge branch 'clearnet' into publicchat_signed 6 years ago
sachaaaaa 155a3b8f17
Merge pull request #512 from neuroscr/desktop-analytics
Desktop Analytics
6 years ago
sachaaaaa a3d677819b
Merge pull request #508 from Mikunj/duplicate-message-fix
Public chat duplicate message fix
6 years ago
Maxim Shishmarev 687e9db77b Custom message rendering of mentions 6 years ago
Ryan Tharp 3150a6ce11 separate out new/open, more lint/cleanup 6 years ago
Ryan Tharp 51eaa90823 use window.mixpanel, remove eventEmitter 6 years ago
Ryan Tharp 68186afba2 lint and remove unneeded params 6 years ago
sachaaaaa 3b450e28da lint 6 years ago
sachaaaaa f8e9e1d3bd Remove rejected authorisation from database 6 years ago
sachaaaaa e07f81c150 Add LokiFileServerAPI 6 years ago
sachaaaaa dc6d3b5ca2 Add LokiPublicChatAPI (extends LokiAppDotNetAPI) 6 years ago
sachaaaaa 33ea259d45 Rename file 6 years ago
sachaaaaa fc00373897 Change LokiPublicChatAPI to LokiAppDotNetAPI, add annotations getter and setter 6 years ago
Ryan Tharp a97788c7d9 modernize annotations since we're making a backward-incomp change 6 years ago
Ryan Tharp a0b52826e9 sign and only show verified messages 6 years ago
Maxim Shishmarev 1496a368e9 Add UI elements for searching and selecting members in a group chat 6 years ago
Ryan Tharp 88b44390bf Desktop Analytics 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
Mikunj 75a527e828 Replaced value with a descriptive constant. 6 years ago
Mikunj 001d882273 Add comment to fix up confusion. 6 years ago
Mikunj 19b0dabe11 Keep a cache of the last 5 fetched messages for public chat so we can use it to detect duplicate messages. 6 years ago
Mikunj 3152637cdc Fix more check on deletion. 6 years ago
Ryan Tharp ca5275b410 better guard 6 years ago
Ryan Tharp e6d22aab19 pass serverId back to the server 6 years ago
sachaaaaa d3c3184405 Search returns primary device when looking up secondary pub key 6 years ago
Mikunj e6d62cb22c Review changes.
Increase mod time to 30 seconds.
6 years ago
Mikunj 0b898612d9 Linting. 6 years ago