From: kaniini <ariadne@dereferenced.org>
Date: Mon, 11 Nov 2019 19:10:44 +0000 (+0000)
Subject: Merge branch 'feature/static-fe' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=2cc043591c0d69a8793a70db39ddd2429b1c03f5;hp=-c;p=akkoma

Merge branch 'feature/static-fe' into 'develop'

Static frontend

See merge request pleroma/pleroma!1917
---

2cc043591c0d69a8793a70db39ddd2429b1c03f5
diff --combined CHANGELOG.md
index 727dde9be,7ae52a28b..945e7dc4d
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -10,7 -10,6 +10,7 @@@ The format is based on [Keep a Changelo
  
  ### Changed
  - **Breaking:** Elixir >=1.8 is now required (was >= 1.7)
 +- **Breaking:** attachment links (`config :pleroma, :instance, no_attachment_links` and `config :pleroma, Pleroma.Upload, link_name`) disabled by default
  - Replaced [pleroma_job_queue](https://git.pleroma.social/pleroma/pleroma_job_queue) and `Pleroma.Web.Federator.RetryQueue` with [Oban](https://github.com/sorentwo/oban) (see [`docs/config.md`](docs/config.md) on migrating customized worker / retry settings)
  - Introduced [quantum](https://github.com/quantum-elixir/quantum-core) job scheduler
  - Enabled `:instance, extended_nickname_format` in the default config
@@@ -38,6 -37,7 +38,7 @@@
  ### Added
  - Refreshing poll results for remote polls
  - Authentication: Added rate limit for password-authorized actions / login existence checks
+ - Static Frontend: Add the ability to render user profiles and notices server-side without requiring JS app.
  - Mix task to re-count statuses for all users (`mix pleroma.count_statuses`)
  - Support for `X-Forwarded-For` and similar HTTP headers which used by reverse proxies to pass a real user IP address to the backend. Must not be enabled unless your instance is behind at least one reverse proxy (such as Nginx, Apache HTTPD or Varnish Cache).
  <details>
@@@ -59,12 -59,10 +60,12 @@@
  - Pleroma API: `POST /api/v1/pleroma/conversations/read` to mark all conversations as read
  - Mastodon API: Add `/api/v1/markers` for managing timeline read markers
  - Mastodon API: Add the `recipients` parameter to `GET /api/v1/conversations`
 +- Configuration: `feed` option for user atom feed.
  </details>
  
  ### Fixed
  - Report emails now include functional links to profiles of remote user accounts
 +- Not being able to log in to some third-party apps when logged in to MastoFE
  <details>
    <summary>API Changes</summary>
  
diff --combined config/config.exs
index 17d15256f,685c18380..75f463797
--- a/config/config.exs
+++ b/config/config.exs
@@@ -90,7 -90,7 +90,7 @@@ config :pleroma, Pleroma.Captcha.Kocapt
  config :pleroma, Pleroma.Upload,
    uploader: Pleroma.Uploaders.Local,
    filters: [Pleroma.Upload.Filter.Dedupe],
 -  link_name: true,
 +  link_name: false,
    proxy_remote: false,
    proxy_opts: [
      redirect_on_failure: false,
@@@ -257,7 -257,7 +257,7 @@@ config :pleroma, :instance
    mrf_transparency_exclusions: [],
    autofollowed_nicknames: [],
    max_pinned_statuses: 1,
 -  no_attachment_links: false,
 +  no_attachment_links: true,
    welcome_user_nickname: nil,
    welcome_message: nil,
    max_report_comment_size: 1000,
@@@ -274,13 -274,7 +274,13 @@@
    account_field_name_length: 512,
    account_field_value_length: 2048,
    external_user_synchronization: true,
 -  extended_nickname_format: false
 +  extended_nickname_format: true
 +
 +config :pleroma, :feed,
 +  post_title: %{
 +    max_length: 100,
 +    omission: "..."
 +  }
  
  config :pleroma, :markup,
    # XXX - unfortunately, inline images must be enabled by default right now, because
@@@ -605,6 -599,8 +605,8 @@@ config :pleroma, Pleroma.ActivityExpira
  
  config :pleroma, Pleroma.Plugs.RemoteIp, enabled: false
  
+ config :pleroma, :static_fe, enabled: false
+ 
  config :pleroma, :web_cache_ttl,
    activity_pub: nil,
    activity_pub_question: 30_000
diff --combined docs/configuration/cheatsheet.md
index 61783cf3f,dddd379d3..6c7f60203
--- a/docs/configuration/cheatsheet.md
+++ b/docs/configuration/cheatsheet.md
@@@ -523,7 -523,7 +523,7 @@@ config :pleroma, :workers
  
  Configuration for [Quantum](https://github.com/quantum-elixir/quantum-core) jobs scheduler.
  
 -See [Quantum readme](https://github.com/quantum-elixir/quantum-core#usage) for the list of supported options. 
 +See [Quantum readme](https://github.com/quantum-elixir/quantum-core#usage) for the list of supported options.
  
  Example:
  
@@@ -593,10 -593,6 +593,10 @@@ See the [Quack Github](https://github.c
  ## Database options
  
  ### RUM indexing for full text search
 +
 +!!! warning
 +    It is recommended to use PostgreSQL v11 or newer. We have seen some minor issues with lower PostgreSQL versions.
 +
  * `rum_enabled`: If RUM indexes should be used. Defaults to `false`.
  
  RUM indexes are an alternative indexing scheme that is not included in PostgreSQL by default. While they may eventually be mainlined, for now they have to be installed as a PostgreSQL extension from https://github.com/postgrespro/rum.
@@@ -798,3 -794,10 +798,10 @@@ config :auto_linker
    ]
  ```
  
+ ## :static_fe
+ 
+ Render profiles and posts using server-generated HTML that is viewable without using JavaScript.
+ 
+ Available options:
+ 
+ * `enabled` - Enables the rendering of static HTML. Defaults to `false`.