From 59c83674e892132d5907304a6f992fc887bb57e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Farr=C3=A9?= <contact@marc.fun>
Date: Sun, 6 Jul 2025 18:22:39 +0100
Subject: [PATCH 1/2] Enh: Migration to Bootstrap 5 for HumHub 1.18

---
 docs/CHANGELOG.md     | 3 ++-
 module.json           | 4 ++--
 views/admin/index.php | 8 ++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 0ee0b0f..5188354 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,9 +1,10 @@
 Changelog
 =========
 
-1.0.5 (Unreleased)
+1.1.0 (Unreleased)
 ---------------------
 - Enh #4: Use PHP CS Fixer
+- Enh: Migration to Bootstrap 5 for HumHub 1.18
 
 1.0.4 (May 23, 2024)
 ---------------------
diff --git a/module.json b/module.json
index c8c4f6a..10e1afd 100644
--- a/module.json
+++ b/module.json
@@ -4,9 +4,9 @@
     "description": "Integrating GitHub Sign-In (OAuth 2.0).",
     "keywords": [
     ],
-    "version": "1.0.5",
+    "version": "1.1.0",
     "homepage": "https://github.com/humhub-contrib/auth-github",
     "humhub": {
-        "minVersion": "1.6"
+        "minVersion": "1.18"
     }
 }
diff --git a/views/admin/index.php b/views/admin/index.php
index 0447036..7e31d7f 100644
--- a/views/admin/index.php
+++ b/views/admin/index.php
@@ -1,8 +1,8 @@
 <?php
-/* @var $this \humhub\modules\ui\view\components\View */
+/* @var $this \humhub\components\View */
 /* @var $model \humhubContrib\auth\github\models\ConfigureForm */
 
-use yii\bootstrap\ActiveForm;
+use humhub\widgets\form\ActiveForm;
 use yii\helpers\Html;
 
 ?>
@@ -13,7 +13,7 @@
 
         <div class="panel-body">
             <p>
-                <?= Html::a(Yii::t('AuthGithubModule.base', 'GitHub Documentation'), 'https://docs.github.com/en/developers/apps/creating-an-oauth-app', ['class' => 'btn btn-primary pull-right btn-sm', 'target' => '_blank']); ?>
+                <?= Html::a(Yii::t('AuthGithubModule.base', 'GitHub Documentation'), 'https://docs.github.com/en/developers/apps/creating-an-oauth-app', ['class' => 'btn btn-primary float-end btn-sm', 'target' => '_blank']); ?>
                 <?= Yii::t('AuthGithubModule.base', 'Please follow the GitHub instructions to create the required <strong>OAuth client</strong> credentials.'); ?>
                 <br/>
             </p>
@@ -31,7 +31,7 @@
             <?= $form->field($model, 'redirectUri')->textInput(['readonly' => true]); ?>
             <br/>
 
-            <div class="form-group">
+            <div class="mb-3">
                 <?= Html::submitButton(Yii::t('base', 'Save'), ['class' => 'btn btn-primary', 'data-ui-loader' => '']) ?>
             </div>
 

From ab5c3b20835b3018267da71474b02585ea193325 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Farr=C3=A9?= <contact@marc.fun>
Date: Sun, 6 Jul 2025 18:24:22 +0100
Subject: [PATCH 2/2] Add PR ID to CHANGELOG

---
 docs/CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 5188354..3045a51 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -4,7 +4,7 @@ Changelog
 1.1.0 (Unreleased)
 ---------------------
 - Enh #4: Use PHP CS Fixer
-- Enh: Migration to Bootstrap 5 for HumHub 1.18
+- Enh #5: Migration to Bootstrap 5 for HumHub 1.18
 
 1.0.4 (May 23, 2024)
 ---------------------