You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
session-desktop/stylesheets
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
..
_conversation.scss Added QR code viewing. 6 years ago
_debugLog.scss
_emoji.scss
_global.scss Merge branch 'clearnet' into multi-device 6 years ago
_index.scss Loki changes 7 years ago
_ios.scss
_lightbox.scss
_mixins.scss
_modal.scss
_modules.scss Only shorten pubkeys if name is present 6 years ago
_options.scss
_password.scss
_progress.scss
_recorder.scss
_settings.scss
_theme_dark.scss Modified colour of dark mod badge 6 years ago
_variables.scss
manifest.scss