Updating Converse upstream (with bootstrap5):

* bootstrap 5 compatibility
* other Converse updates integration
* hack to get the sidebar work as with Converse v10.
* modal onHide was renamed close.
* fix slow mode infobox margin.
* fix margin
* shorter action label, for better dropdown UX.
This commit is contained in:
John Livingston
2024-08-05 15:54:03 +02:00
parent 33da4314af
commit 003cb24dd8
18 changed files with 99 additions and 73 deletions

View File

@ -18,10 +18,8 @@ set -x
CONVERSE_VERSION="v11.0.0"
CONVERSE_REPO="https://github.com/conversejs/converse.js.git"
# You can eventually set CONVERSE_COMMIT to a specific commit ID, if you want to apply some patches.
# 2024-07-31: using Converse upstream (v11 WIP).
CONVERSE_COMMIT="2f8cfc02d04bb6191b3b9facb706e475836279f5"
# # 2024-07-31: testing the jcbrand/bootstrap5 branch
# CONVERSE_COMMIT="e5edeec997d53a8720470a49685be123e8688e1c"
# 2024-08-05: using Converse upstream (v11 WIP).
CONVERSE_COMMIT="5017efb780973d704f237c478ba52b23d901e1bf"
# It is possible to use another repository, if we want some customization that are not upstream (yet):
# CONVERSE_VERSION="livechat"
@ -29,6 +27,10 @@ CONVERSE_COMMIT="2f8cfc02d04bb6191b3b9facb706e475836279f5"
# CONVERSE_REPO="https://github.com/JohnXLivingston/converse.js"
# CONVERSE_COMMIT="xxxx"
# 2024-08-06: including fix waiting for merge:
CONVERSE_VERSION="livechat_converse_11"
CONVERSE_COMMIT="f69b96439ac15d0fc9c138319e2d635ab28be071"
rootdir="$(pwd)"
src_dir="$rootdir/conversejs"
converse_src_dir="$rootdir/vendor/conversejs-$CONVERSE_VERSION"