diff options
| -rw-r--r-- | CHANGELOG.md | 26 | ||||
| -rw-r--r-- | config/description.exs | 2 | ||||
| -rw-r--r-- | lib/pleroma/healthcheck.ex | 2 | ||||
| -rw-r--r-- | mix.exs | 10 | ||||
| -rw-r--r-- | priv/static/adminfe/static/fonts/element-icons.535877f.woff | bin | 0 -> 28200 bytes | |||
| -rw-r--r-- | priv/static/adminfe/static/fonts/element-icons.732389d.ttf | bin | 0 -> 55956 bytes |
6 files changed, 34 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index ec191575f..d469793f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -40,24 +40,44 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Filtering of push notifications on activities from blocked domains - Resolving Peertube accounts with Webfinger -## [unreleased-patch] +## [Unreleased (patch)] + +### Fixed +- Healthcheck reporting the number of memory currently used, rather than allocated in total + +## [2.0.3] - 2020-05-02 + ### Security - Disallow re-registration of previously deleted users, which allowed viewing direct messages addressed to them - Mastodon API: Fix `POST /api/v1/follow_requests/:id/authorize` allowing to force a follow from a local user even if they didn't request to follow +- CSP: Sandbox uploads ### Fixed -- Logger configuration through AdminFE +- Notifications from blocked domains +- Potential federation issues with Mastodon versions before 3.0.0 - HTTP Basic Authentication permissions issue +- Follow/Block imports not being able to find the user if the nickname started with an `@` +- Instance stats counting internal users +- Inability to run a From Source release without git - ObjectAgePolicy didn't filter out old messages -- Transmogrifier: Keep object sensitive settings for outgoing representation (AP C2S) +- `blob:` urls not being allowed by CSP ### Added - NodeInfo: ObjectAgePolicy settings to the `federation` list. +- Follow request notifications <details> <summary>API Changes</summary> - Admin API: `GET /api/pleroma/admin/need_reboot`. </details> +### Upgrade notes + +1. Restart Pleroma +2. Run database migrations (inside Pleroma directory): + - OTP: `./bin/pleroma_ctl migrate` + - From Source: `mix ecto.migrate` + + ## [2.0.2] - 2020-04-08 ### Added - Support for Funkwhale's `Audio` activity diff --git a/config/description.exs b/config/description.exs index 39e094082..504161a9f 100644 --- a/config/description.exs +++ b/config/description.exs @@ -712,7 +712,7 @@ config :pleroma, :config_description, [ key: :quarantined_instances, type: {:list, :string}, description: - "List of ActivityPub instances where private (DMs, followers-only) activities will not be send", + "List of ActivityPub instances where private (DMs, followers-only) activities will not be sent", suggestions: [ "quarantined.com", "*.quarantined.com" diff --git a/lib/pleroma/healthcheck.ex b/lib/pleroma/healthcheck.ex index 8f7f43ec2..92ce83cb7 100644 --- a/lib/pleroma/healthcheck.ex +++ b/lib/pleroma/healthcheck.ex @@ -29,7 +29,7 @@ defmodule Pleroma.Healthcheck do @spec system_info() :: t() def system_info do %Healthcheck{ - memory_used: Float.round(:erlang.memory(:total) / 1024 / 1024, 2) + memory_used: Float.round(:recon_alloc.memory(:allocated) / 1024 / 1024, 2) } |> assign_db_info() |> assign_job_queue_stats() @@ -72,7 +72,15 @@ defmodule Pleroma.Mixfile do def application do [ mod: {Pleroma.Application, []}, - extra_applications: [:logger, :runtime_tools, :comeonin, :quack, :fast_sanitize, :ssl], + extra_applications: [ + :logger, + :runtime_tools, + :comeonin, + :quack, + :fast_sanitize, + :ssl, + :eldap + ], included_applications: [:ex_syslogger] ] end diff --git a/priv/static/adminfe/static/fonts/element-icons.535877f.woff b/priv/static/adminfe/static/fonts/element-icons.535877f.woff Binary files differnew file mode 100644 index 000000000..02b9a2539 --- /dev/null +++ b/priv/static/adminfe/static/fonts/element-icons.535877f.woff diff --git a/priv/static/adminfe/static/fonts/element-icons.732389d.ttf b/priv/static/adminfe/static/fonts/element-icons.732389d.ttf Binary files differnew file mode 100644 index 000000000..91b74de36 --- /dev/null +++ b/priv/static/adminfe/static/fonts/element-icons.732389d.ttf |