Merge remote-tracking branch 'upstream/develop' into shigusegubu

* upstream/develop: (83 commits)
  Password reset page
  add a comment
  force img updating immediately
  Fixed "sequimiento" to "seguimiento".
  Replace `/api/externalprofile/show.json` with a MastoAPI equialent
  Use mastodon api in follow requests
  "Optional" in lowercase.
  Update es.json
  fix pin/unpin status logic
  rename a mutation
  update
  fix user avatar fallback logic
  remove dead code
  Corrected "Media Proxy" translation.
  Update es.json
  make bio textarea resizable vertically only
  remove dead code
  Make image orientation consistent on FF, fix videos w/ modal
  remove dead code
  fix crazy watch logic in conversation
  ...
This commit is contained in:
Henry Jameson 2019-09-08 17:12:11 +03:00
commit 1a9ee23ec2
60 changed files with 2361 additions and 269 deletions

View file

@ -27,7 +27,8 @@
}
</style>
</head>
<body style="display: none">
<body>
<noscript>To use Pleroma, please enable JavaScript.</noscript>
<div id="app"></div>
<!-- built files will be auto injected -->
</body>