Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations

2019-11-20 15:47:11 +03:00 · 2019-11-20 15:47:11 +03:00 · 4f88b1b435
commit 4f88b1b435
parent de892d2fe1 937d6c6b32
15 changed files with 19 additions and 4 deletions
--- a/.dockerignore
+++ b/.dockerignore
@ -5,7 +5,6 @@ CC-BY-SA-4.0
 COPYING
 *file
 elixir_buildpack.config
-docs/
 test/

 # Required to get version
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -81,6 +81,22 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Mastodon API: Inability to get some local users by nickname in `/api/v1/accounts/:id_or_nickname`
 </details>

+## [1.1.6] - 2019-11-19
+### Fixed
+- Not being able to log into to third party apps when the browser is logged into mastofe
+- Email confirmation not being required even when enabled
+- Mastodon API: conversations API crashing when one status is malformed
+
+### Bundled Pleroma-FE Changes
+#### Added
+- About page
+- Meme arrows
+
+#### Fixed
+- Image modal not closing unless clicked outside of image
+- Attachment upload spinner not being centered
+- Showing follow counters being 0 when they are actually hidden
+
 ## [1.1.5] - 2019-11-09
 ### Fixed
 - Polls having different numbers in timelines/notifications/poll api endpoints due to cache desyncronization
--- a/priv/static/index.html
+++ b/priv/static/index.html
@ -1 +1 @@
-<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,user-scalable=no"><title>Pleroma</title><!--server-generated-meta--><link rel=icon type=image/png href=/favicon.png><link rel=stylesheet href=/static/font/css/fontello.css><link rel=stylesheet href=/static/font/css/animation.css><link href=/static/css/vendors~app.b2603a50868c68a1c192.css rel=stylesheet><link href=/static/css/app.fd71461124f3eb029b1b.css rel=stylesheet></head><body class=hidden><noscript>To use Pleroma, please enable JavaScript.</noscript><div id=app></div><script type=text/javascript src=/static/js/vendors~app.5c3fab032deb5f2793cb.js></script><script type=text/javascript src=/static/js/app.105d64a8fcdd6724ccde.js></script></body></html>
+<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,user-scalable=no"><title>Pleroma</title><!--server-generated-meta--><link rel=icon type=image/png href=/favicon.png><link rel=stylesheet href=/static/font/css/fontello.css><link rel=stylesheet href=/static/font/css/animation.css><link href=/static/css/vendors~app.b2603a50868c68a1c192.css rel=stylesheet><link href=/static/css/app.fd71461124f3eb029b1b.css rel=stylesheet></head><body class=hidden><noscript>To use Pleroma, please enable JavaScript.</noscript><div id=app></div><script type=text/javascript src=/static/js/vendors~app.76db8e4cdf29decd5cab.js></script><script type=text/javascript src=/static/js/app.d20ca27d22d74eb7bce0.js></script></body></html>
--- a/priv/static/static/js/2.c96b30ae9f2d3f46f0ad.js
+++ b/priv/static/static/js/2.c96b30ae9f2d3f46f0ad.js
--- a/priv/static/static/js/2.c96b30ae9f2d3f46f0ad.js.map
+++ b/priv/static/static/js/2.c96b30ae9f2d3f46f0ad.js.map
--- a/priv/static/static/js/app.105d64a8fcdd6724ccde.js
+++ b/priv/static/static/js/app.105d64a8fcdd6724ccde.js
--- a/priv/static/static/js/app.105d64a8fcdd6724ccde.js.map
+++ b/priv/static/static/js/app.105d64a8fcdd6724ccde.js.map
--- a/priv/static/static/js/app.d20ca27d22d74eb7bce0.js
+++ b/priv/static/static/js/app.d20ca27d22d74eb7bce0.js
--- a/priv/static/static/js/app.d20ca27d22d74eb7bce0.js.map
+++ b/priv/static/static/js/app.d20ca27d22d74eb7bce0.js.map
--- a/priv/static/static/js/vendors~app.5c3fab032deb5f2793cb.js.map
+++ b/priv/static/static/js/vendors~app.5c3fab032deb5f2793cb.js.map
--- a/priv/static/static/js/vendors~app.76db8e4cdf29decd5cab.js
+++ b/priv/static/static/js/vendors~app.76db8e4cdf29decd5cab.js
--- a/priv/static/static/js/vendors~app.76db8e4cdf29decd5cab.js.map
+++ b/priv/static/static/js/vendors~app.76db8e4cdf29decd5cab.js.map
--- a/priv/static/sw-pleroma.js
+++ b/priv/static/sw-pleroma.js
--- a/test/web/mastodon_api/controllers/filter_controller_test.exs
+++ b/test/web/mastodon_api/controllers/filter_controller_test.exs
@ -3,7 +3,7 @@
 # SPDX-License-Identifier: AGPL-3.0-only

 defmodule Pleroma.Web.MastodonAPI.FilterControllerTest do
-  use Pleroma.Web.ConnCase, async: true
+  use Pleroma.Web.ConnCase

  alias Pleroma.Web.MastodonAPI.FilterView

--- a/test/web/mastodon_api/controllers/scheduled_activity_controller_test.exs
+++ b/test/web/mastodon_api/controllers/scheduled_activity_controller_test.exs
@ -3,7 +3,7 @@
 # SPDX-License-Identifier: AGPL-3.0-only

 defmodule Pleroma.Web.MastodonAPI.ScheduledActivityControllerTest do
-  use Pleroma.Web.ConnCase, async: true
+  use Pleroma.Web.ConnCase

  alias Pleroma.Repo
  alias Pleroma.ScheduledActivity