3 files changed, 23 insertions, 10 deletions

diff --git a/.github/mailmap b/.github/mailmap
index 366946e8..15a25e43 100644
--- a/.github/mailmap
+++ b/.github/mailmap
@@ -3,6 +3,7 @@ ArthurHoaro <arthur@hoa.ro> Arthur
 Florian Eula <eula.florian@gmail.com> feula
 Florian Eula <eula.florian@gmail.com> <mr.pikzen@gmail.com>
 Immánuel Fodor <immanuelfactor+github@gmail.com>
+Immánuel Fodor <immanuelfactor+github@gmail.com> Immánuel! <21174107+immanuelfodor@users.noreply.github.com>
 kalvn <kalvnthereal@gmail.com> <kalvn@users.noreply.github.com>
 kalvn <kalvnthereal@gmail.com> <kalvn@pm.me>
 Neros <contact@neros.fr> <NerosTie@users.noreply.github.com>
diff --git a/AUTHORS b/AUTHORS
index 9c5028eb..fe2aa882 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,22 +1,24 @@
-   903  ArthurHoaro <arthur@hoa.ro>
+   973  ArthurHoaro <arthur@hoa.ro>
    402  VirtualTam <virtualtam@flibidi.net>
-   250  nodiscc <nodiscc@gmail.com>
+   291  nodiscc <nodiscc@gmail.com>
     56  Sébastien Sauvage <sebsauvage@sebsauvage.net>
     16  Luce Carević <lcarevic@access42.net>
     15  Florian Eula <eula.florian@gmail.com>
     13  Emilien Klein <emilien@klein.st>
     12  Nicolas Danelon <hi@nicolasmd.com.ar>
+     9  Lucas Cimon <lucas.cimon@gmail.com>
      9  Willi Eggeling <thewilli@gmail.com>
      8  Christophe HENRY <christophe.henry@sbgodin.fr>
-     7  Lucas Cimon <lucas.cimon@gmail.com>
      6  B. van Berkum <dev@dotmpe.com>
+     6  Immánuel Fodor <immanuelfactor+github@gmail.com>
+     6  Keith Carangelo <mail@kcaran.com>
      6  kalvn <kalvnthereal@gmail.com>
      6  llune <llune@users.noreply.github.com>
      5  Mark Schmitz <kramred@gmail.com>
      5  Sébastien NOBILI <code@pipoprods.org>
+     5  dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
      4  Alexandre Alapetite <alexandre@alapetite.fr>
      4  David Sferruzza <david.sferruzza@gmail.com>
-     4  Immánuel Fodor <immanuelfactor+github@gmail.com>
      3  Agurato <mail.vmonot@gmail.com>
      3  Teromene <teromene@teromene.fr>
      2  Alexandre G.-Raymond <alex@ndre.gr>
@@ -30,7 +32,6 @@
      2  Qwerty <champlywood@free.fr>
      2  Stephen Muth <smuth4@gmail.com>
      2  Timo Van Neerden <fire@lehollandaisvolant.net>
-     2  dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
      2  flow.gunso <flow.gunso@gmail.com>
      2  julienCXX <software@chmodplusx.eu>
      2  philipp-r <philipp-r@users.noreply.github.com>
@@ -75,4 +76,5 @@
      1  dimtion <zizou.xena@gmail.com>
      1  durcheinandr <jochen@durcheinandr.de>
      1  lapineige <lapineige@users.noreply.github.com>
+     1  owen bell <66233223+xfnw@users.noreply.github.com>
      1  rfolo9li <50079896+rfolo9li@users.noreply.github.com>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4bae5b48..e2fb480b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## [v0.12.0](https://github.com/shaarli/Shaarli/releases/tag/v0.12.0-beta) - UNRELEASED [beta 2020-08-27]
+## [v0.12.0](https://github.com/shaarli/Shaarli/releases/tag/v0.12.0-beta) - UNRELEASED [beta 2020-08-27 - beta-1 2020-09-30]
 
 **Save you `data/` folder before updating!**
 
@@ -16,6 +16,8 @@ Be aware that by using a beta version you might encounter bugs, and that 3rd par
 - Markdown rendering is now integrated into Shaarli core
 - Add autofocus on tag cloud filter input
 - Japanese translations
+- Japanese translation: add language to admin configuration page
+- Support for PHP 8.0
 - Support for local anchor URL (startting with `#`)
 - LDAP authentication
 - Encapsulated PageCacheManager
@@ -24,18 +26,22 @@ Be aware that by using a beta version you might encounter bugs, and that 3rd par
   - section about mkdocs
   - Ulauncher extension
 - CI: run against PHP 7.4
+- Added $links_per_page variable to template and display on default
+- Inject BookmarkServiceInterface in plugins data
+- Add manual configuration for root URL
+- Added PATCH to the allowed Apache request methods.
 
 ### Changed
 - Introduce Bookmark object and Service layer
   - Save bookmark as objects in the datastore
   - Handle bookmark as objects across the whole codebase (except templates and plugins)
 - Process all Shaarli page through Slim controller, with proper URL rewriting (see #1516)
+- Docs: the entire documentation has been reviewed, updated and improved, thanks to @nodiscc!
 - ATOM feed: use instance name as author name instead of URL
 - Updated French translation
-- Docs:
-  - Troubleshooting page rewritten
-  - Updated unit tests page
-  - Updated Server security page
+- Default colors plugin: generate CSS file during initialization
+- Improve default bookmarks after install
+- Upgrade all front end dependencies and webpack build
 
 ### Fixed
 - Undefined index: thumbnail in daily page
@@ -54,6 +60,8 @@ Be aware that by using a beta version you might encounter bugs, and that 3rd par
 - Division by zero in tag cloud
 - CI: deprecated linux distribution and sudo directive
 - Docker build: gcc is no longer included in python alpine image
+- Default template: display pin button in mobile view
+- Pinned bookmarks are not longer displayed first in ATOM/RSS feeds
 - Docs:
   - Outdated Docker documentation for stable branch
   - Outdated links
@@ -63,6 +71,8 @@ Be aware that by using a beta version you might encounter bugs, and that 3rd par
 - Markdown plugin
 - Docs:
   - emojione & twemoji removed
+- Makefile: remove static_analysis_summary from all: target
+- doc/Makefile: remove references to composer update
 
 ## [v0.11.1](https://github.com/shaarli/Shaarli/releases/tag/v0.11.1) - 2019-08-03