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 Prettier: Format all stylesheets 7 years ago
_emoji.scss Move left pane entirely to React 6 years ago
_global.scss Merge branch 'clearnet' into multi-device 6 years ago
_index.scss Loki changes 6 years ago
_ios.scss Merge v1.23.0 6 years ago
_lightbox.scss Finish new Message component, integrate into application 7 years ago
_mixins.scss Finish new Message component, integrate into application 7 years ago
_modal.scss Finish new Message component, integrate into application 7 years ago
_modules.scss Only shorten pubkeys if name is present 6 years ago
_options.scss New React component: Message 7 years ago
_password.scss Added db resetting. 6 years ago
_progress.scss Prettier: Format all stylesheets 7 years ago
_recorder.scss Move left pane entirely to React 6 years ago
_settings.scss Merge branch 'textsecure/master' into merge_1_21_0 6 years ago
_theme_dark.scss Modified colour of dark mod badge 6 years ago
_variables.scss Merge signal-1.24.0 6 years ago
manifest.scss Rename launcherView to passwordView. 6 years ago