From b028f0869f31bbc50922ddabb046e2842664ce74 Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Thu, 8 Oct 2020 08:41:30 +0200
Subject: [PATCH] CHANGELOG and AUTHORS for v0.12.0-beta-2

---
 AUTHORS      | 6 ++++--
 CHANGELOG.md | 8 ++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index fe2aa882..7dd0e57d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,6 +1,6 @@
-   973	ArthurHoaro <arthur@hoa.ro>
+   989	ArthurHoaro <arthur@hoa.ro>
    402	VirtualTam <virtualtam@flibidi.net>
-   291	nodiscc <nodiscc@gmail.com>
+   294	nodiscc <nodiscc@gmail.com>
     56	Sébastien Sauvage <sebsauvage@sebsauvage.net>
     16	Luce Carević <lcarevic@access42.net>
     15	Florian Eula <eula.florian@gmail.com>
@@ -20,6 +20,7 @@
      4	Alexandre Alapetite <alexandre@alapetite.fr>
      4	David Sferruzza <david.sferruzza@gmail.com>
      3	Agurato <mail.vmonot@gmail.com>
+     3	Christoph Stoettner <christoph.stoettner@stoeps.de>
      3	Teromene <teromene@teromene.fr>
      2	Alexandre G.-Raymond <alex@ndre.gr>
      2	Chris Kuethe <chris.kuethe@gmail.com>
@@ -78,3 +79,4 @@
      1	lapineige <lapineige@users.noreply.github.com>
      1	owen bell <66233223+xfnw@users.noreply.github.com>
      1	rfolo9li <50079896+rfolo9li@users.noreply.github.com>
+     1	sprak3000 <sprak3000+github@gmail.com>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e2fb480b..95c7be80 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,8 @@ 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 - beta-1 2020-09-30]
+## [v0.12.0](https://github.com/shaarli/Shaarli/releases/tag/v0.12.0-beta) - UNRELEASED
+*[beta 2020-08-27 - beta-1 2020-09-30 - beta-2 2020-10-08]*
 
 **Save you `data/` folder before updating!**
 
@@ -18,7 +19,7 @@ Be aware that by using a beta version you might encounter bugs, and that 3rd par
 - Japanese translations
 - Japanese translation: add language to admin configuration page
 - Support for PHP 8.0
-- Support for local anchor URL (startting with `#`)
+- Support for local anchor URL (starting with `#`)
 - LDAP authentication
 - Encapsulated PageCacheManager
 - Docs:
@@ -30,6 +31,7 @@ Be aware that by using a beta version you might encounter bugs, and that 3rd par
 - Inject BookmarkServiceInterface in plugins data
 - Add manual configuration for root URL
 - Added PATCH to the allowed Apache request methods.
+- REST API: compatibility with ionos Apache's headers
 
 ### Changed
 - Introduce Bookmark object and Service layer
@@ -42,6 +44,7 @@ Be aware that by using a beta version you might encounter bugs, and that 3rd par
 - Default colors plugin: generate CSS file during initialization
 - Improve default bookmarks after install
 - Upgrade all front end dependencies and webpack build
+- Default theme: Make tag cloud/list views buttons more obvious
 
 ### Fixed
 - Undefined index: thumbnail in daily page
@@ -66,6 +69,7 @@ Be aware that by using a beta version you might encounter bugs, and that 3rd par
   - Outdated Docker documentation for stable branch
   - Outdated links
   - Plugin description in meta files
+- docker-compose.yml: pin traefik image to 1.7-alpine
 
 ### Removed
 - Markdown plugin