Commit Graph

514 Commits

Author SHA1 Message Date
Roger Braun b37a0f4f23 Add direct message tab. 2018-11-13 20:34:56 +01:00
Roger Braun 1de382f026 Put oauth text into description. 2018-11-08 19:27:19 +01:00
Roger Braun a04795d723 Display OAuth login on login form button. 2018-11-08 16:12:05 +01:00
scarlett 4cc1ed6171 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into hide-statistics 2018-10-16 14:09:29 +01:00
Henry Jameson fb29e7c73d more workings and even less explosions. 2018-10-03 21:21:48 +03:00
kaniini 65c03f1a0b Merge branch 'i18n/no_rich_text' into 'develop'
Less confusing description for no_rich_text_formatting

See merge request pleroma/pleroma-fe!351
2018-09-27 21:24:23 +00:00
Henry Jameson 6165b7366a Merge remote-tracking branch 'upstream/develop' into feature/scope_preferences
* upstream/develop:
  i think it's due to my shitty js-to-json regex
2018-09-25 14:48:02 +03:00
Henry Jameson 455cd0d028 settings for scope/subject 2018-09-25 14:47:02 +03:00
Henry Jameson 85235981d1 i think it's due to my shitty js-to-json regex 2018-09-25 14:30:05 +03:00
Henry Jameson 11f1bac502 Less confusing description 2018-09-25 14:01:01 +03:00
William Pitcock 1af5c8fd39 add support for disabling rich text formatting 2018-09-22 03:54:05 +00:00
Henry Jameson 1c2f0029e4 Merge remote-tracking branch 'upstream/develop' into betterStorage
* upstream/develop:
  More languages
  added usage
  a tool to check what's missing from a language
  all other languages which do not have MRs related to them separated
  seems to be working
2018-09-21 12:14:20 +03:00
Henry Jameson 0656e0ef32 Merge remote-tracking branch 'upstream/develop' into translations-separation
* upstream/develop: (21 commits)
  use prime number step for Who to follow panel
  fix
  Revert "Update messages.js"
  Update messages.js Update the Occitan language - Fixed Linting
  remove formatting options
  Remove outdated settings
  features panel i18n
  features panes supports chat & gopher
  fix collapse link being too small
  small fix for non-square gif avatars
  Fixed collapseMessageWithSubjectLocal always using instance-provided config.
  Fix last place with usercard having wrong width
  Fixed non-masked image looking weird in chrome.
  Kinda went back to using align-items: stretch. Fixed error message floating.
  Simplified image sensitivity label
  show features panel only if not login
  update
  debug
  update
  debug
  ...
2018-09-09 15:55:43 +03:00
Henry Jameson b4a5fddea8 all other languages which do not have MRs related to them separated 2018-09-06 21:29:39 +03:00