Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles...

diff --combined CHANGELOG.md
index a4881cc829fda8a98fddeabe301fa04e74bf6c4a,7d5256600df8986d5e5995d8667feddb28f0341b..fb782e82c04d1e4c045e9972748410cb290e9b93
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -48,7 -48,6 +48,7 @@@ The format is based on [Keep a Changelo
  
  ### Added
  
 +- Frontends: Add configurable frontends for primary and admin fe.
  - Chats: Added `accepts_chat_messages` field to user, exposed in APIs and federation.
  - Chats: Added support for federated chats. For details, see the docs.
  - ActivityPub: Added support for existing AP ids for instances migrated from Mastodon.
@@@ -68,6 -67,7 +68,7 @@@
  - Support pagination in emoji packs API (for packs and for files in pack)
  - Support for viewing instances favicons next to posts and accounts
  - Added Pleroma.Upload.Filter.Exiftool as an alternate EXIF stripping mechanism targeting GPS/location metadata.
+ - "By approval" registrations mode.
  - Configuration: Added `:welcome` settings for the welcome message to newly registered users.
  
  <details>

diff --combined config/config.exs
index d9c7969bc3aad6780f84f50b1765d8b2c0ceed30,4b91a58b746de9830726a80d8a8524e8a997852e..0c9685c4c76cec8e15c6e985419c5e639422ef2d
--- 1/config/config.exs
--- 2/config/config.exs
+++ b/config/config.exs
@@@ -205,6 -205,7 +205,7 @@@ config :pleroma, :instance
    registrations_open: true,
    invites_enabled: false,
    account_activation_required: false,
+   account_approval_required: false,
    federating: true,
    federation_incoming_replies_max_depth: 100,
    federation_reachability_timeout_days: 7,
@@@ -237,6 -238,7 +238,7 @@@
    max_remote_account_fields: 20,
    account_field_name_length: 512,
    account_field_value_length: 2048,
+   registration_reason_length: 500,
    external_user_synchronization: true,
    extended_nickname_format: true,
    cleanup_attachments: false,
@@@ -653,9 -655,7 +655,9 @@@ config :pleroma, :static_fe, enabled: f
  # With no frontend configuration, the bundled files from the `static` directory will
  # be used.
  #
 -# config :pleroma, :frontends, primary: %{"name" => "pleroma", "ref" => "develop"}
 +# config :pleroma, :frontends, 
 +# primary: %{"name" => "pleroma", "ref" => "develop"},
 +# admin: %{"name" => "admin", "ref" => "stable"}
  
  config :pleroma, :web_cache_ttl,
    activity_pub: nil,

diff --combined docs/configuration/cheatsheet.md
index 58bf787c84d1fc339f38ddcbfdea6ac6882b570e,d6a9276eeb6f7613b3c61f79c11da79ca3df156d..9aa1e2f2c0d39f392aa5501ac20b1c6f005fd234
--- 1/docs/configuration/cheatsheet.md
--- 2/docs/configuration/cheatsheet.md
+++ b/docs/configuration/cheatsheet.md
@@@ -33,6 -33,7 +33,7 @@@ To add configuration to your config fil
  * `registrations_open`: Enable registrations for anyone, invitations can be enabled when false.
  * `invites_enabled`: Enable user invitations for admins (depends on `registrations_open: false`).
  * `account_activation_required`: Require users to confirm their emails before signing in.
+ * `account_approval_required`: Require users to be manually approved by an admin before signing in.
  * `federating`: Enable federation with other instances.
  * `federation_incoming_replies_max_depth`: Max. depth of reply-to activities fetching on incoming federation, to prevent out-of-memory situations while fetching very long threads. If set to `nil`, threads of any depth will be fetched. Lower this value if you experience out-of-memory crashes.
  * `federation_reachability_timeout_days`: Timeout (in days) of each external federation target being unreachable prior to pausing federating to it.
@@@ -58,6 -59,7 +59,7 @@@
  * `max_remote_account_fields`: The maximum number of custom fields in the remote user profile (default: `20`).
  * `account_field_name_length`: An account field name maximum length (default: `512`).
  * `account_field_value_length`: An account field value maximum length (default: `2048`).
+ * `registration_reason_length`: Maximum registration reason length (default: `500`).
  * `external_user_synchronization`: Enabling following/followers counters synchronization for external users.
  * `cleanup_attachments`: Remove attachments along with statuses. Does not affect duplicate files and attachments without status. Enabling this will increase load to database when deleting statuses on larger instances.
  
@@@ -1051,11 -1053,11 +1053,11 @@@ Control favicons for instances
  
  Frontends in Pleroma are swappable - you can specify which one to use here.
  
 -For now, you can set a frontend with the key `primary` and the options of `name` and `ref`. This will then make Pleroma serve the frontend from a folder constructed by concatenating the instance static path, `frontends` and the name and ref.
 +You can set a frontends for the key `primary` and `admin` and the options of `name` and `ref`. This will then make Pleroma serve the frontend from a folder constructed by concatenating the instance static path, `frontends` and the name and ref.
  
 -The key `primary` refers to the frontend that will be served by default for general requests. In the future, other frontends like the admin frontend will also be configurable here.
 +The key `primary` refers to the frontend that will be served by default for general requests. The key `admin` refers to the frontend that will be served at the `/pleroma/admin` path.
  
 -If you don't set anything here, the bundled frontend will be used.
 +If you don't set anything here, the bundled frontends will be used.
  
  Example:
  
@@@ -1064,10 -1066,6 +1066,10 @@@ config :pleroma, :frontends
    primary: %{
      "name" => "pleroma",
      "ref" => "stable"
 +  },
 +  admin: %{
 +    "name" => "admin",
 +    "ref" => "develop"
    }
  ```