Commit Graph

3971 Commits (69dcfa2845cb791560de1090ef074659b55440f6)

Author SHA1 Message Date
Maxim Shishmarev a5fce17d8c public chat invitations 5 years ago
Ryan Tharp 8f52080eed immediately set profile name on public chat servers when you update it 5 years ago
Ryan Tharp 065f2ca47f setProfileName refactor, setHomeServer(), immediate detect if our ProfileName gets out of sync on the server 5 years ago
Ryan Tharp a147afec12 add note 5 years ago
Ryan Tharp bb9912dcc5 update some notes 5 years ago
Maxim Shishmarev 9d50c21b29
Merge pull request #635 from msgmaxim/context-menu-select
Don't select messages when context menu is shown
5 years ago
Ryan Tharp 7088411cff fix where the avatar went 5 years ago
Ryan Tharp 6bd1227189 add back missing avatarAnnotation for now, move setLastRetrievedMessage to after multidevice processing, make getListOfMembers async, subscribe to the channel when it registers, partChannel(), getSubscribers(), fix avatar message object placement 5 years ago
Ryan Tharp 95a94175c0 make findOrCreateChannel async 5 years ago
Ryan Tharp ced6563358 make maybeShowMembers async for lokiPublicChatAPI.getListOfMembers call 5 years ago
Ryan Tharp 0d47f305ca add missing await 5 years ago
Ryan Tharp 30ed04a3b1 tell the server when you leave the channel 5 years ago
sachaaaaa 94dd331cb1 Show pubkey QR code in pairing dialog (as primary) 5 years ago
sachaaaaa 63fd72d971 Make linter happy 6 years ago
sachaaaaa db0068b429 Sending and handling of special UNPAIRING_REQUEST message 6 years ago
Ryan Tharp 106a42306e Merge branch 'clearnet' of https://github.com/loki-project/loki-messenger into multidevice-publicchat 6 years ago
Ryan Tharp 3508658e00 pull avatar out of annotation, put it in profile 6 years ago
Maxim Shishmarev 8cd8c8d4f9
Merge pull request #610 from msgmaxim/profile-pictures
Enable custom profile pictures
6 years ago
Maxim Shishmarev 02cf9d58c8 Explicitly set server id for avatars to null 6 years ago
Ryan Tharp 207e3d022f Merge branch 'profile-pictures' of https://github.com/msgmaxim/loki-messenger into multidevice-publicchat 6 years ago
Maxim Shishmarev e06c2bf248
Merge pull request #634 from msgmaxim/modifier-keys
Jump words with Ctrl and arrow keys
6 years ago
Ryan Tharp 0c8873b5a2 constant naming clean up, remove slavePrimaryMap from LokiAppDotNetAPI, request user_annotations, home server support, use new verifyPrimaryPubKeys return format, avatar stubs 6 years ago
Ryan Tharp e1554496d2 convert LokiFileServerAPI to factory and use establishHomeConnection, lint 6 years ago
Ryan Tharp 85185714ae export a factory, LokiHomeServerInstance/LokiFileServerInstance split, verifyUserObjectDeviceMap change return to object, remove getDeviceMappingForUsers because too small, avatar map, adjust constant format 6 years ago
Ryan Tharp a186aa8a10 lint 6 years ago
Maxim Shishmarev 5a08ac9cc1 Use avatar specific endpoint 6 years ago
sachaaaaa 40208442e6 lint 6 years ago
Maxim Shishmarev 8b2876dadc Disable context menu and message selection for RSS feed 6 years ago
Maxim Shishmarev 2262b41cd7 Prevent hiding the context menu by clicking away to also potentially select messages 6 years ago
sachaaaaa 78f97bf116
Merge pull request #633 from sachaaaaa/ensure_primaryDevicePubKey_set
Ensure primaryDevicePubKey is always defined in storage
6 years ago
sachaaaaa 8850d9bcce Only set when account already created 6 years ago
Maxim Shishmarev 0abd9af449 Jump words with Ctrl and arrow keys 6 years ago
sachaaaaa 0b41ef0983 Ensure primaryDevicePubKey is always defined in storage 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
sachaaaaa 6c28b1aa79
Merge pull request #623 from loki-project/multi-device
Multi device
6 years ago
sachaaaaa a83f66f0da Cap paired devices to 1 6 years ago
Maxim Shishmarev d1c450a213
Merge pull request #621 from msgmaxim/select-messages
Prevent clicking on quote from selecting the message
6 years ago
Beaudan Brown 685ada5cc5 Merge branch 'clearnet' into prep-merge 6 years ago
Beaudan Campbell-Brown a2e8e6480f
Merge pull request #539 from neuroscr/multidevice-publicchat
[multi-device] public chat
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
Maxim Shishmarev 6c4fa6986b Prevent clicking on quote from selecting the message 6 years ago
Ryan Tharp bd17c4b026 lint 6 years ago
Beaudan Campbell-Brown d15d560f58
Merge pull request #618 from sachaaaaa/simplify_bulk_edit_bar
Prevent instantiating a new BulkEdit react component with every click
6 years ago
Beaudan Campbell-Brown 9b8d71370b
Merge pull request #611 from BeaudanBrown/fix-mic
Disable microphone button when you have disabled permissions
6 years ago
sachaaaaa 7f96b4c95c lazy instantiation 6 years ago
Beaudan Brown f1c155b943 Stop sending sync messages to public chats and mark messages from any of our devices as outgoing 6 years ago
Beaudan Brown ac762d43d5 Reduce indentation and simplify code by using existing verification functions 6 years ago
sachaaaaa bd9a900a1b Prevent instantiating a new BulkEdit react component with every click 6 years ago
Beaudan Campbell-Brown b42a8aab1f
Typo
Co-Authored-By: sachaaaaa <40749766+sachaaaaa@users.noreply.github.com>
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
Beaudan Brown 807f4cbd2a Storing primary device pubkey on the conversation model for easier access, ensuring that we accept all the friend requests from the primary conversation rather than the secondary 6 years ago
sachaaaaa b7b2776340 Address review 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
Beaudan Brown 24a687c106 Throttle the refreshing of device mappings to once every minute 6 years ago
Beaudan Brown 030264c689 Fix misuse of getAllDevicePubKeysForPrimaryPubKey and rename some vars 6 years ago
Beaudan Brown 8c79800cee Use oninput for secondary devices names and allow for consecutive pairings without closing the dialog 6 years ago
Beaudan Campbell-Brown 6611a10855
Merge pull request #590 from BeaudanBrown/session-reset-on-fr
Session reset on fr
6 years ago
Beaudan Brown b7dd4257d6 Disable microphone button when you have disabled permissions 6 years ago
Beaudan Brown 370dee5abb Ensure we have the correct apis and listeners during the pairing process. Catch upnp error. Remove redundant friend requests 6 years ago
Beaudan Brown c31535edb4 Rename blockSync, only send contacts and profile if sending a GRANT request, do *not* always be friends with secondary devices because we still need to complete a friend request exchange 6 years ago
Beaudan Brown 332cd30052 Send contact sync message when becoming friends with contact and auto accept/send friend requests when receiving contact sync 6 years ago
sachaaaaa 5529deb019
Merge pull request #602 from sachaaaaa/unpairing_device
[multi-device] Allow unpairing device
6 years ago
Beaudan Campbell-Brown e88aca57f2
Merge pull request #603 from sachaaaaa/Fix_secondary_nickname
[multi-device] Fix secondary nickname
6 years ago
Beaudan Campbell-Brown 0f74a002df
Merge pull request #601 from BeaudanBrown/sync-messages
[multi-device] Sync messages
6 years ago
Beaudan Brown 15c07ea7df Sync secondary devices again but handle the receiving of them properly 6 years ago
sachaaaaa 86168ef870 lower case variable 6 years ago
Maxim Shishmarev 027e17f7d0 Reset multi selection when conversation is deleted/changed 6 years ago
sachaaaaa 3f52b9df93 Make unpairing a toggle-able feature (enable with window.lokiFeatureFlags.multiDeviceUnpairing = true) 6 years ago
Beaudan Brown accd16cae1 Trigger friend request received update for the correct device conversation, throttle the sending of automated friend requests and don't send them to devices which sent *us* a friend request 6 years ago
Beaudan Brown 41fdcef695 Ensure that we can't miss the apisReady event and only listen for single emit 6 years ago
Maxim Shishmarev 7c96990119 Correctly handle server errors in multi-deletion 6 years ago
sachaaaaa cd2c4b993a lint 6 years ago
sachaaaaa dc626ec4d0 use primary device pubkey when setting nickname 6 years ago
sachaaaaa 9ab3626149 Fix italic tags showing up 6 years ago
sachaaaaa 497f42165a Allow unpairing device 6 years ago
Maxim Shishmarev 8677fb15a0 Select multiple messages and bulk deletion 6 years ago
sachaaaaa 13572c3524
Merge branch 'multi-device' into paired_device_alias 6 years ago
sachaaaaa ea267fb952
Merge pull request #597 from sachaaaaa/show_secondary_secret_words
[multi-device]Show secondary secret words
6 years ago
Beaudan Brown 7e275ac266 Don't sync secondary devices and make sure initAPIs has been called before sending friend requests to synced contacts 6 years ago
Beaudan Brown f16b032056 Handle sync messages properly for some edge cases, ensure we always have a primaryDevicePubKey, send contact sync message 6 years ago
sachaaaaa 46613de846 lint 6 years ago
sachaaaaa b324421534 Allow primary device to assign local aliases to paired devices 6 years ago
Maxim Shishmarev 395daf3aba Use Array.includes in place of Array.indexOf 6 years ago
Maxim Shishmarev a2f836c690 Address review comments 6 years ago
Maxim Shishmarev 7c05939f55 Add group admins and the ability to remove members from private groups 6 years ago
Maxim Shishmarev 0df5214979 Limit small private groups to 10 members 6 years ago
Maxim Shishmarev 9f81f67460 Can leave private group chats 6 years ago
Maxim Shishmarev f5e9a870f7 Add support for mentions in 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
sachaaaaa 9ddc237f6d show pairing words instead of pubkeys on the primary device's paired devices list. 6 years ago
Maxim Shishmarev 6c08852118
Merge pull request #593 from msgmaxim/not-friends
Fix incorrectly showing friend request as pending
6 years ago
Maxim Shishmarev 279328f47b
Merge pull request #595 from msgmaxim/fix-rss
Clean up RSS conversation
6 years ago
sachaaaaa 65361d33f5 New menu item "show pairing words" for secondary devices 6 years ago
Maxim Shishmarev e64ccbdd2b Clean up RSS conversation 6 years ago
Maxim Shishmarev 9e6f6d5a01 Fix incorrectly showing friend request as pending 6 years ago
Maxim Shishmarev 1f4af59dad Delete public chat messages locally if not stored on the server 6 years ago
Beaudan Brown e9dc3b531e Simplify auto accept check 6 years ago
Beaudan Brown 653fd06451 Don't await for some background messages 6 years ago
Beaudan Brown 8ccf62ed4e Trigger endSession code if we receive a friend request from a friend 6 years ago
Beaudan Brown cc8277f54d Better variable name and use it in more places 6 years ago
Beaudan Brown 883feb668d The rest of my multidevice work, send messages to all the correct devices and automatic friend request if not friends with a device 6 years ago
Beaudan Campbell-Brown aa66b28ffe
Merge pull request #579 from BeaudanBrown/friends-with-any
Add isFriendsWithAnyDevice and use it in relevant places
6 years ago
Beaudan Brown 76b36845bb Add isFriendsWithAnyDevice and use it in relevant places 6 years ago
Beaudan Brown 6a512503f0 Update display name sanitisation to allow a bunch of languages and spaces 6 years ago
Beaudan Brown 08ad913105 Add explicit isSecondary flag to conversation list items so they can remain hidden in the menu after they become friends etc 6 years ago
Beaudan Brown 2f52995e18 Fix the delete messages button to not break the conversation 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 49fcb50d48 Update link preview settings to be cleaner 6 years ago
Beaudan Brown 22df66c08f Fix missing await, fix undefined bug 6 years ago
Beaudan Brown 3bdbf03658 Enforce display name 6 years ago
Mikunj 3ba71fad9e Linting. 6 years ago
Beaudan Brown 5e1e70ac8c Enable link previews by default 6 years ago
Beaudan Brown f52bc4d5b5 Cheeky lint and name change 6 years ago
Beaudan Campbell-Brown b56dfbabaf
Merge pull request #566 from BeaudanBrown/group-attachments
Group attachments
6 years ago
Beaudan Brown a3019e12bf Hide android friend request accepts and lint 6 years ago
Beaudan Brown b66abca17d Disable files for friend requests 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 c9b11814a6
Merge pull request #567 from BeaudanBrown/name-restriction
Display name restrictions 2
6 years ago
Beaudan Campbell-Brown ac80ef0d4e
Merge pull request #557 from BeaudanBrown/add-server
Add server
6 years ago
Beaudan Brown 602ec1ccaf Also block displayname characters in the edit display name menu and change spaces to underscores 6 years ago
Beaudan Brown f538aeea50 Remove old link preview system 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 29e83cadbf Check against null message body when detecting mentions 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 39fac5fd02 Add initial add server UI skeleton 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
Beaudan Brown 8d6fee4aec Merge branch 'clearnet' into multi-device 6 years ago
Maxim Shishmarev e26f764fca
Merge pull request #549 from msgmaxim/mentions5
Highlight conversations with unread mentions of the user
6 years ago
Maxim Shishmarev 5f3342fa42
Merge pull request #538 from msgmaxim/mentions4
Show mentions as profile names and treat them as indivisible elements
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 53bdf14321 refactor 6 years ago
Maxim Shishmarev 8be1c61f4c Highlight conversations with unread mentions of the user 6 years ago
sachaaaaa 1f3311bc5d Save device mappings upon accepting friend request + various fixes 6 years ago
sachaaaaa 6415e33122
Merge pull request #543 from sachaaaaa/fix_update_mapping_after_init_api
[multi-device] Secondary device to update device mapping to server after lokiFileSer…
6 years ago
sachaaaaa c48f52b590
Merge pull request #542 from sachaaaaa/fix_secondary_sig_fileserver
[multi-device] Fix signatures being sent to file server as arraybuffer
6 years ago
sachaaaaa b73e6035c1
Merge pull request #541 from sachaaaaa/no_secondary_timeout
[multi-device] No secondary timeout
6 years ago
sachaaaaa b5924c5bad lint 6 years ago
sachaaaaa 48ce9a7649 lint 6 years ago
sachaaaaa cbee5a884c Secondary device to update device mapping to server after lokiFileServerAPI creation 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
Beaudan Brown 64ccd05a2e Capitalise constants 6 years ago
sachaaaaa c4728cf4f3 Provide a cancel button instead of a timeout for secondary registration 6 years ago
Beaudan Brown 7b0f40535f QoL with auto focus display name box and enter/esc key functionality on profile screen. Restrict display name characters to alphanumeric (easy to work around) 6 years ago
Maxim Shishmarev 0980eafe74 First round of code review addressed 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 f268fbb552
Merge pull request #534 from sachaaaaa/use_file_server_device_mapping
[multi-device] Use file server device mapping
6 years ago
sachaaaaa 52f103f3d3
Merge pull request #532 from sachaaaaa/reset_pairing_view
[multi-device] Reset pairing view after error
6 years ago
sachaaaaa 634d274ffc
Merge pull request #531 from sachaaaaa/remove_all_private_conv
[multi-device] Remove private convs only
6 years ago
Maxim Shishmarev 4e39f1e0eb When composing: show mentions as profile names and treat them as indivisible elements 6 years ago
sachaaaaa cc04bee38a Start all the receivers only after the secondary registration is finished 6 years ago
sachaaaaa d8a45a901f lint 6 years ago
sachaaaaa a314721cce Both devices to update their mapping after secondary registration 6 years ago
sachaaaaa 5aa1af7ae8 Reset pairing view after error 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
Maxim Shishmarev 16692696e0 address reviews 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 db8ac66118 fix method 6 years ago
Ryan Tharp 3150a6ce11 separate out new/open, more lint/cleanup 6 years ago
Ryan Tharp d4ca49ae95 separate out note to self 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
Ryan Tharp c921d3e3b3 allow mixpanel to be already set up elsewhere 6 years ago
Maxim Shishmarev c54979bb41 Address review comments 6 years ago
Maxim Shishmarev 6c57346af0 Add missing file in tests 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 fa6cde6cb9 use await/async 6 years ago
sachaaaaa 8ecf057386 Display list of paired device in modal 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
Mikunj 75a527e828 Replaced value with a descriptive constant. 6 years ago
Mikunj 001d882273 Add comment to fix up confusion. 6 years ago
sachaaaaa bd16bc5b9b lint 6 years ago
sachaaaaa 6de6b762e6 Ensure the latest contact signed prekey is used 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 59609a13f9
Merge pull request #502 from neuroscr/clearnet
pass serverId back to the server
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 Varsani ec790ddf89
Merge pull request #500 from Mikunj/link-preview-fix
Fix unnecessary link preview fetches.
6 years ago
Mikunj a9710a68db Purge cache on failure. 6 years ago
Mikunj Varsani 51f161a613
Merge pull request #498 from Mikunj/mod-badges
Mod badges
6 years ago
Mikunj Varsani d302004225
Merge pull request #493 from BeaudanBrown/delete-polling-fix
Make sure we are always updating the last deleted id
6 years ago
Mikunj Varsani 0acea50acb
Merge pull request #490 from BeaudanBrown/incoming-public
Fix duplicate detection for sent messages in public chat
6 years ago
Mikunj 0636e635d5 Fix unnecessary link preview fetches. 6 years ago
sachaaaaa f9df221638
Merge pull request #497 from sachaaaaa/prevent_multiple_retrievers
[multi-device] Ensure API objects are inited only once
6 years ago
Mikunj e6d62cb22c Review changes.
Increase mod time to 30 seconds.
6 years ago
Mikunj 0b898612d9 Linting. 6 years ago
Mikunj 0883b1b650 Updated styles.
Merge commit clearnet into mod-badges
6 years ago
sachaaaaa 025ad10fc5 Ensure API objects are inited only once 6 years ago
Mikunj Varsani c48ae80468
Merge pull request #486 from Mikunj/profile-icons
Profile icons
6 years ago
sachaaaaa 43976c6c43
Merge pull request #494 from sachaaaaa/fix_last_hash
Fix last hash all being NULL in database
6 years ago
Beaudan Brown e9a2b57d37 Show crown icon for moderators 6 years ago
Beaudan Campbell-Brown ec5a69f1cf
Merge pull request #489 from msgmaxim/replies
Enable quotes in public chats
6 years ago
sachaaaaa 3beb6004db Fix last hash all being NULL in database 6 years ago
Beaudan Brown 72b3d02b52 Poll for moderators, store them on the conversation and use the list to determine our own mod status 6 years ago
Beaudan Brown 97746307f0 Make sure we are always updating the last deleted id 6 years ago
sachaaaaa e5eab74b1b Fix #355 Display timestamp for friend requests 6 years ago
Beaudan Brown 9fe613967a Fix duplicate detection for sent messages in public chat 6 years ago
Maxim Shishmarev 5cf63af3a3 Enable quotes in public chats 6 years ago
sachaaaaa b10835ffc7 Share contact upon authorising secondary device 6 years ago
sachaaaaa cf3ddf0b03
Merge pull request #466 from sachaaaaa/mnemonic_secret
[multi-device] Show 3 last mnemonic representation of public key
6 years ago
Mikunj 500a88dbab Removed identicon.js
Updated profile image helper.
6 years ago
Beaudan Brown 9beea2cbd3 Enforce curlies completely and lint with new settings 6 years ago
Beaudan Brown 6f995d6a96 Resolve linter issues 6 years ago
Beaudan Brown f9ca6e4cf2 Merge branch 'publicchat-config' of https://github.com/neuroscr/loki-messenger into neuroscr-publicchat-config 6 years ago
Beaudan Brown 0c870d04e3 Stop polling when leaving public chat, only grab the most recent 100 messages on first poll 6 years ago
Ryan Tharp 220f0aa9f5 handle empty servers better 6 years ago
Beaudan Campbell-Brown bf7742932b
Merge pull request #480 from BeaudanBrown/loop-stopping
Stop polling on public chat deletion
6 years ago
Beaudan Campbell-Brown 6e6428928c
Merge pull request #479 from neuroscr/use-user-obj
Make sure public chat timers can't be restarted / Channel name bug fix
6 years ago
Beaudan Brown d2dcd6c23d Stop polling when you leave the public chat, clear up a bit 6 years ago
Ryan Tharp eb3d22f2b0 remove unneeded comment 6 years ago
Ryan Tharp c97f26465c set correct name on conversation 6 years ago
Ryan Tharp eea6bac7e6 add setGroupName() 6 years ago
Beaudan Campbell-Brown 4836b74f60
Merge pull request #478 from BeaudanBrown/clean-branches
Clean up redundant repetition of successive code duplication one after the other
6 years ago
Beaudan Campbell-Brown f9c7a6ff3d
Merge pull request #475 from neuroscr/use-user-obj
Use user obj / pull channel name/avatar from server
6 years ago
Ryan Tharp 6d1c9700b1 this.stop guard on channelAPI 6 years ago
Beaudan Brown c4a95218fa Make even smaller 6 years ago
Ryan Tharp e382afdf91 make timers stoppable, delete throw parameter, pollForChannel() pattern update 6 years ago
Beaudan Brown 3894f2784e Clean up redundant repetition 6 years ago
Ryan Tharp f093490bec lint plus constant fix 6 years ago
Ryan Tharp 2ca23db141 Merge branch 'use-user-obj' of https://github.com/neuroscr/loki-messenger into use-user-obj 6 years ago
Ryan Tharp 5b193b9e47 remove throw for now, squash ifs, some future avatar notes 6 years ago
Ryan Tharp 35d059eae5 was getting some weird errors, going to try this 6 years ago
Beaudan Campbell-Brown e70b875226
Merge pull request #474 from BeaudanBrown/hide-menus
Remove most of the right click and cog menu options for the public chats
6 years ago
Ryan Tharp 3f35170eae
Merge branch 'clearnet' into use-user-obj 6 years ago
Ryan Tharp 428a3b7077 add back conversationId 6 years ago
Beaudan Brown 870dc7f904 Fix tests, refactor menu items to please linter and lint 6 years ago
Beaudan Brown 66459ac4bd Remove most of the right click and cog menu options for the public chats 6 years ago
sachaaaaa ef6b22f6b9 Simplify and lint 6 years ago
Beaudan Brown da97d15891 Log when there are errors polling 6 years ago
Beaudan Brown 0dd180d4f4 Wrap polling function in try finally for safety, fix issue with empty array check and lint 6 years ago
Ryan Tharp e25ed0aba3 move pubkey/name out of annotation into user object, read channel meta data from server, throw alert if delete fails, constant name clean up, store timers, Calls refreshModStatus/pollForChannel in cstr 6 years ago
Ryan Tharp b3e2a5aba8 move refreshModStatus into constructor of channelAPI, just instantiate channelAPI now 6 years ago
Beaudan Brown 8f4b0a2088 Don't look 6 years ago
sachaaaaa 35b6182074 Clean up after account registration failure 6 years ago
sachaaaaa e50a29ffa5 Show 3 last mnemonic representation of public key instead of public key during pairing 6 years ago
Beaudan Campbell-Brown 48b6bf54c1
Merge pull request #461 from Mikunj/qr-code
Pubkey QR code
6 years ago
Mikunj 58b0c5ef39 Removed a line 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 21dad58537 Linting. 6 years ago
Mikunj 831ae09576 Cherry pick "profile simplification" from Mik 6 years ago
Beaudan Brown cccf533abc Save conversation after all messages are processed 6 years ago
Mikunj 3d179909c7 Decrease the correctness level on the QR code. 6 years ago
Beaudan Brown 27976a053c Save the last retrieved message for public chats on the conversation 6 years ago
Beaudan Brown ef8b515d70 Make sure we only initialise special conversations after both registration and storage load have complete 6 years ago
Mikunj 3380500a2d Added QR code viewing. 6 years ago
Beaudan Brown 8066affd2c Move initialisation of public and rss conversations to fix early loading error. Rename function to be more readable 6 years ago
Beaudan 616e952f8e Add right click option to public chat messages to copy pubkey of sender 6 years ago
Beaudan Campbell-Brown f4e76f0576
Merge pull request #455 from neuroscr/public-delete
Public delete
6 years ago
Beaudan Campbell-Brown 17c2817517
Merge pull request #449 from BeaudanBrown/rss-fix
Fix feed reader for single element results
6 years ago
Ryan Tharp 56a4a31ca2 sendMessage(), getOrRefreshServerToken supports forceRefresh, make modStatus a property, additional comments 6 years ago
Ryan Tharp dfd6039c83 use LokiPublicChannelAPI 6 years ago
Ryan Tharp 133f2a5656 replace publicSendData with LokiPublicChannelAPI instance 6 years ago
Ryan Tharp 3178d67295 allow yourself to request deletion of messages 6 years ago
Ryan Tharp 95cca859e9 Merge branch 'deletion-final' of https://github.com/BeaudanBrown/loki-messenger into public-delete 6 years ago
Beaudan Brown 8d77d6fd79 All the API updates, enable mod status retrieval and allow for message deletion 6 years ago
Beaudan Brown 351fa09ad6 Only show delete option if have mod status and show different modal for mod deletion 6 years ago
Beaudan Brown e4ecc5b389 A prepare for message deletion 6 years ago
Beaudan Brown 1b4105a3d0 Fix db stuff and remove unneeded message function 6 years ago
sachaaaaa 3a78f47cd7 Secondary device registration: UX changes (show countdown, disable button, etc.) 6 years ago
Ryan Tharp 33572cac1f use newer delete system every 5s, deleteMessage(), store token in serverAPI, serverRequest refactor, registerChannel now returns the channel found/created, change baseChannelUrl base 6 years ago
Ryan Tharp d5e6ffb1f9 rename deletePublicMessage => deleteLocalPublicMessage 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 7d0b300246 Add deletion polling 6 years ago
Beaudan Brown 3332cb240e Add background event listener 6 years ago
Beaudan Brown 5a70d88747 Add removeMessage function to conversation 6 years ago
Beaudan Brown 6392c77952 Fix database helpers 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
Beaudan Brown 37366198fc Add database tables and helper functions for public server auth 6 years ago
Beaudan Brown 87e57af090 Fix feed reader for single element results 6 years ago
Beaudan Brown fc8aa0211d Addressing reviews 6 years ago
Beaudan Brown 1f7787ecf7 Add token retrieval functions to public chat api 6 years ago
sachaaaaa 1d4c98adf0
Merge pull request #444 from sachaaaaa/logic_fixes
[multi-device] Fix bugs revealed during reviews
6 years ago
sachaaaaa 7e0217dca8
Merge pull request #439 from sachaaaaa/registration_done_secondary
[multi-device] Prevent showing inbox if secondary registration is ongoing
6 years ago
sachaaaaa 16cc1cb400
Merge pull request #443 from sachaaaaa/show_secondary_pubkey_message_details
[multi-device] Format message details to show secondary pubkey properly
6 years ago
sachaaaaa 54f4fd843b
Merge pull request #440 from sachaaaaa/substitute_secondary_with_primary
[multi-device] Display incoming messages in the primary device conversation
6 years ago
sachaaaaa 661b207245 Various fixes for bugs introduced during reviews 6 years ago
sachaaaaa dce8c8bcf7 Format message details to show secondary pubkey properly 6 years ago
sachaaaaa 2c052a65a2 Display incoming messages in the primary device conversation 6 years ago
sachaaaaa 415ea7992c Prevent showing inbox if secondary device registration is still ongoing 6 years ago
sachaaaaa 4dd62a265c Allow receiving and sending messages before lokiP2PApi is defined. 6 years ago
sachaaaaa f5f6b37852 Enable link preview for i.imgur.com, tenor and giphy 6 years ago
sachaaaaa 06d60fd68e
Merge pull request #431 from sachaaaaa/secondary_device_registration_view
[multi-device] Secondary device registration UI
6 years ago
sachaaaaa 24cf1ef3f7
Merge pull request #433 from sachaaaaa/primary_accept_request
[multi-device] UI for accepting pairing request on Primary devices
6 years ago
sachaaaaa 79d842635d fix events registration issues 6 years ago
sachaaaaa 2754969b23 Ensure one listener and one event for 'secondaryDeviceRegistration' 6 years ago
sachaaaaa 1ced8e348b
Merge pull request #432 from sachaaaaa/pair_device_menu_item
[multi-device] Display "Pair New Device" in menu
6 years ago
sachaaaaa ac4038e86a Dialogs for device pairing requests - Primary device side 6 years ago
sachaaaaa b5aee4f4be Display "Pair New Device" in menu for non-secondary devices 6 years ago
sachaaaaa 632e35c8a5 Secondary device registration UI 6 years ago
sachaaaaa a4411007b0 Pairing authorisations: refactor proto, change sql table, add getters 6 years ago
Beaudan Brown 895cedc801 Lint 6 years ago
Beaudan Brown 662c64f347 Remove ability to delete some rss conversations 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 962469a54c messenger and loki.network feeds 6 years ago
Ryan Tharp 1536a7e5f9 support multiple RSS feeds 6 years ago
Ryan Tharp d0ddcaf1fe update feed url, handle no items more gracefully, start on dns check 6 years ago
Ryan Tharp d3cf055128 rss avatar guard 6 years ago
Ryan Tharp a67e7fcfe1 guard for CI fix 6 years ago
Ryan Tharp 93eb19bab5 add space, refactor out friendRequestStatusEnum 6 years ago
Ryan Tharp 22cb7cd540 node/browser constant 6 years ago
Ryan Tharp bbffa89308 make sure we have braces 6 years ago
Ryan Tharp 3d40b55011 do the deferencing correctly 6 years ago
Ryan Tharp c57571fdfd loki.network rss feed 6 years ago
sachaaaaa d208614909 Multi-device part 1: make primary account generate and send authorisation to secondary 6 years ago
sachaaaaa a7f999aeb1
Merge pull request #391 from sachaaaaa/show_seed_errors
Report mnemonic errors instead of silent failure
6 years ago
sachaaaaa 1f3f63dcc6 Report mnemonic error in a toast instead of silently fail 6 years ago
Beaudan c9f433fbba Save message id when sending/receiving to/from public server and lint 6 years ago
Beaudan 899bfc3b2b Add channel id to message table and provide helper functions 6 years ago
Beaudan f857744e88 Revert sending id 6 years ago
sachaaaaa 701f6be00c Add missing mnemonic languages 6 years ago
Beaudan 145b8b6682 Fix message order 6 years ago
Beaudan 5bdfaeaf1d Don't send read receipts to public chats 6 years ago
Beaudan 406938cf59 Cleaner forceSave 6 years ago
Beaudan 86e55e5dc6 Clean up bold check 6 years ago
Beaudan f7039080af Remove accidental swapfile, save messages with the id given to them from public server 6 years ago
Beaudan f718bf15d2 Prepare to delete message, send message id to server 6 years ago
Beaudan 1a82a35a08 More efficient channel search 6 years ago
Beaudan 143bf1bdc1 Fill out unregister channel stub, trigger unregister channel on conversation deletion 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
Beaudan b4cc9430be Add loki schema versioning and create new public conversation 6 years ago
Beaudan ccfc9046b4 Fix tests 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 9dae805017 Run lint 6 years ago
Beaudan Campbell-Brown 73b417e605
Merge pull request #371 from BeaudanBrown/testnet
Separate testnet
6 years ago
Beaudan 492bb3723a Move pubkey truncation to loki_rpc and add window function 6 years ago
Beaudan Campbell-Brown 98f1c8d80b
Merge pull request #380 from BeaudanBrown/profile-fix
Catch this little rascal. Profile names should update consistently now
6 years ago
Beaudan 55152cd33a Catch this little rascal. Profile names should update consistently now 6 years ago
Beaudan Campbell-Brown b5c232f54a
Merge pull request #378 from BeaudanBrown/typing-friend-request
Also don't send typing messages for people we aren't friends with
6 years ago
Beaudan Campbell-Brown dd7bf1b2bb
Merge pull request #370 from msgmaxim/clipboard
Add a button to paste pubkey from clipboard if valid
6 years ago
Beaudan debd211fe5 Also don't send typing messages for people we aren't friends with 6 years ago
Beaudan Campbell-Brown fc12f01ab3
Merge pull request #374 from msgmaxim/no-read-receipt-unless-friends
Only send read receipts if friends
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
Beaudan Campbell-Brown 6a3062860d
Merge pull request #365 from sachaaaaa/beta-disclaimer
Add one-time disclaimer at startup for beta release
6 years ago