Commit Graph

17 Commits (acd3f41b6c982e1f06e31af90a4fc4b9eb995de3)

Author SHA1 Message Date
Beaudan Brown 685ada5cc5 Merge branch 'clearnet' into prep-merge 5 years ago
sachaaaaa 006f817faa make linter happy 5 years ago
sachaaaaa c9e3757381 dial the logging down a notch 5 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 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 d3c3184405 Search returns primary device when looking up secondary pub key 6 years ago
Beaudan Brown 66459ac4bd Remove most of the right click and cog menu options for the public chats 6 years ago
sachaaaaa b5aee4f4be Display "Pair New Device" in menu for non-secondary devices 6 years ago
Beaudan Brown 662c64f347 Remove ability to delete some rss conversations 6 years ago
Ryan Tharp c57571fdfd loki.network rss feed 6 years ago
Mikunj b8ef6c2cc6 Loki changes
Added friends section in search.

This is because contacts is now used in signal for something else and we don't want to clash meanings.

Styling fixes

Add dropdown options into mainheader

Updated styling

Restore StartNewConversation to the old ui style of loki messenger.

Fix friend search display.

Fix header expand animation.

Hooked up menu actions.

Linting.

More styling changes.

Fix tests.

Added back in the loki logo below the gutter.

Fix toast positioning.

Fix context menu showing incorrectly on virtual lists.

Added tabs.

Linting
6 years ago
Mikunj 3152f92e30 Merge signal 1.23.2
# Conflicts:
#	app/sql.js
#	js/conversation_controller.js
#	package.json
6 years ago
Mikunj 7387e88c97 Add showing friends in search. 6 years ago
Scott Nonnenberg 6ffbc0ac06 Archive Conversation 6 years ago
Scott Nonnenberg 031b64a476 Disable full-text search until we can go to arbitrary messages 6 years ago
Scott Nonnenberg b3ac1373fa Move left pane entirely to React 6 years ago