Commit Graph

732 Commits (5123fa04099e9577717ce72984f3d77134f267a8)

Author SHA1 Message Date
Audric Ackermann be5f932c08 fix lint 5 years ago
Audric Ackermann bd7f587aa7 Center avatar and display name in UserDetailsDialog 5 years ago
Audric Ackermann e3a8e5f73c UserDetailsDialog: set a separate className 5 years ago
Maxim Shishmarev aa35eb61fa
Merge pull request #659 from msgmaxim/invitations
Tweak style for group invitations in dark mode
5 years ago
Maxim Shishmarev 5a4ea93594
Merge pull request #653 from Bilb/clearnet
Fix the conversation horizontal scrollbar when only few conversations #560
5 years ago
Maxim Shishmarev 60eccd89ae Tweak style for group invitations in dark mode 5 years ago
Audric Ackermann c19b53d3fd Disable horizontal scrollbar on conversation list #560 5 years ago
Maxim Shishmarev 07c39523e9 Show appropriate message in group invitation dialog on no friends 5 years ago
Maxim Shishmarev a5fce17d8c public chat invitations 5 years ago
Maxim Shishmarev 8cd8c8d4f9
Merge pull request #610 from msgmaxim/profile-pictures
Enable custom profile pictures
5 years ago
Maxim Shishmarev 2990c95e40 Fix incorrect margins for public messages and friend request bubbles 5 years ago
Maxim Shishmarev 4dd314c18f Enable profile pictures 5 years ago
Beaudan Brown 685ada5cc5 Merge branch 'clearnet' into prep-merge 5 years ago
Maxim Shishmarev 8677fb15a0 Select multiple messages and bulk deletion 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 90f1d4a6aa Display error messages when creating/updating 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
Maxim Shishmarev 6c08852118
Merge pull request #593 from msgmaxim/not-friends
Fix incorrectly showing friend request as pending
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
Beaudan Brown d97eced37b Merge branch 'clearnet' into multi-device 6 years ago
Beaudan Brown 3bdbf03658 Enforce display name 6 years ago
Maxim Shishmarev c477661af0 Prevent chat member's pubkey from overflowing 6 years ago
Beaudan Brown 8d6fee4aec Merge branch 'clearnet' into multi-device 6 years ago
Maxim Shishmarev 8be1c61f4c Highlight conversations with unread mentions of the user 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
Maxim Shishmarev 687e9db77b Custom message rendering of mentions 6 years ago
Maxim Shishmarev 1496a368e9 Add UI elements for searching and selecting members in a group chat 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
Maxim Shishmarev 0d9e4bbf45 Only shorten pubkeys if name is present 6 years ago
Mikunj f860076587 Modified colour of dark mod badge 6 years ago
Mikunj 0b898612d9 Linting. 6 years ago
Mikunj 0883b1b650 Updated styles.
Merge commit clearnet into mod-badges
6 years ago
Mikunj ea5bc24253 Updated design 6 years ago
Beaudan Brown e9a2b57d37 Show crown icon for moderators 6 years ago
sachaaaaa ef6b22f6b9 Simplify and lint 6 years ago
Beaudan Campbell-Brown 48b6bf54c1
Merge pull request #461 from Mikunj/qr-code
Pubkey QR code
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 3380500a2d Added QR code viewing. 6 years ago
sachaaaaa 7b262561a5 simplify scss for disabled button 6 years ago
sachaaaaa 3a78f47cd7 Secondary device registration: UX changes (show countdown, disable button, etc.) 6 years ago
Mikunj 83d198108c Fix the ui bug where items would appear over the loki logo. 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
sachaaaaa 701f6be00c Add missing mnemonic languages 6 years ago