diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1e3e485f..b836f5b6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,7 +19,7 @@ builddoctranslations:
pages:
stage: deploy
- image: registry.gitlab.com/pages/hugo/hugo_extended:latest
+ image: registry.gitlab.com/pages/hugo/hugo_extended:0.132.2
variables:
GIT_SUBMODULE_STRATEGY: recursive
GIT_SUBMODULE_PATHS: support/documentation/themes/hugo-theme-relearn
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 692437e7..5168289b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,24 @@
# Changelog
+## ??? (Not Released Yet)
+
+### Minor changes and fixes
+
+* Fix styling for "configure mod_firewall" button + Peertube v7.0.0 compatibility
+
+## 12.0.2
+
+### Minor changes and fixes
+
+* Fix task list label styling.
+* Translations updates.
+
+## 12.0.1
+
+### Minor changes and fixes
+
+* Fix custom emojis vs upper/lower case.
+
## 12.0.0
### Importante Notes
diff --git a/conversejs/build-conversejs.sh b/conversejs/build-conversejs.sh
index 9bdd36e3..cffac2bd 100644
--- a/conversejs/build-conversejs.sh
+++ b/conversejs/build-conversejs.sh
@@ -31,8 +31,10 @@ CONVERSE_COMMIT="8f32df723e3aa392db02326dc6a3279c9497b6fb"
# 2024-09-03: include badges short label and quick fix for sendMessage button
CONVERSE_REPO="https://github.com/JohnXLivingston/converse.js"
-CONVERSE_VERSION="livechat-12.0.0"
-# CONVERSE_COMMIT=""
+CONVERSE_VERSION="livechat-12.0.1"
+CONVERSE_COMMIT=""
+# 2024-12-05: fix emojis (don't want some upstream feature, but want this fix)
+# CONVERSE_COMMIT="366a718f16e96c88c6d768722f1525801a2f0c4d"
rootdir="$(pwd)"
src_dir="$rootdir/conversejs"
diff --git a/conversejs/custom/plugins/tasks/styles/muc-task-lists.scss b/conversejs/custom/plugins/tasks/styles/muc-task-lists.scss
index 371cbd11..f0ee6a7b 100644
--- a/conversejs/custom/plugins/tasks/styles/muc-task-lists.scss
+++ b/conversejs/custom/plugins/tasks/styles/muc-task-lists.scss
@@ -34,6 +34,11 @@
.task-list-name {
flex-grow: 2;
+ label {
+ // Cancelling the Peertube margin-bottom on labels
+ margin: 0;
+ }
+
form {
display: flex;
flex-flow: row nowrap;
diff --git a/conversejs/custom/plugins/tasks/templates/muc-task-list.js b/conversejs/custom/plugins/tasks/templates/muc-task-list.js
index 88c1a950..f05d96b7 100644
--- a/conversejs/custom/plugins/tasks/templates/muc-task-list.js
+++ b/conversejs/custom/plugins/tasks/templates/muc-task-list.js
@@ -39,7 +39,7 @@ export default function tplMucTaskList (el, tasklist) {
${!el.edit
? html`