Commit Graph

1260 Commits (41fdcef69503996b1dd1b2fa90eaf129cea23083)

Author SHA1 Message Date
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 d97eced37b Merge branch 'clearnet' into multi-device 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 Campbell-Brown c9b11814a6
Merge pull request #567 from BeaudanBrown/name-restriction
Display name restrictions 2
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 363cd81ccc Hook up UI to all the server creation logic etc 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 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
Maxim Shishmarev 8be1c61f4c Highlight conversations with unread mentions of the user 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 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 cbee5a884c Secondary device to update device mapping to server after lokiFileServerAPI creation 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
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
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 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 b13a4f3e56
Merge pull request #520 from msgmaxim/mentions2
Custom message rendering of mentions
6 years ago
Maxim Shishmarev 16692696e0 address reviews 6 years ago
sachaaaaa 155a3b8f17
Merge pull request #512 from neuroscr/desktop-analytics
Desktop Analytics
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
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 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 bd16bc5b9b lint 6 years ago
sachaaaaa 6de6b762e6 Ensure the latest contact signed prekey is used 6 years ago
sachaaaaa b10835ffc7 Share contact upon authorising secondary device 6 years ago