From ae8008d05cbb8083568ee2c02c656716713fb4b1 Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Mon, 16 Dec 2024 17:00:55 +0530 Subject: [PATCH] chore: bumped up mariadb image version --- .github/helper/install_dependencies.sh | 2 +- .github/workflows/ui-tests.yml | 2 +- docker/docker-compose.yml | 2 +- frontend/package.json | 1 - frontend/src/utils/index.js | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/helper/install_dependencies.sh b/.github/helper/install_dependencies.sh index 574144b8..8f5d06cd 100644 --- a/.github/helper/install_dependencies.sh +++ b/.github/helper/install_dependencies.sh @@ -5,7 +5,7 @@ echo "Setting Up System Dependencies..." sudo apt update sudo apt remove mysql-server mysql-client -sudo apt install libcups2-dev redis-server mariadb-client-10.6 +sudo apt install libcups2-dev redis-server mariadb-client-10.8 install_wkhtmltopdf() { wget -q https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.focal_amd64.deb diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml index f093e55a..e5d9171b 100644 --- a/.github/workflows/ui-tests.yml +++ b/.github/workflows/ui-tests.yml @@ -24,7 +24,7 @@ jobs: services: mariadb: - image: mariadb:10.6 + image: mariadb:10.8 env: MARIADB_ROOT_PASSWORD: 123 ports: diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index a01fdb84..5473e7b2 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" name: lms services: mariadb: - image: mariadb:10.6 + image: mariadb:10.8 command: - --character-set-server=utf8mb4 - --collation-server=utf8mb4_unicode_ci diff --git a/frontend/package.json b/frontend/package.json index 44cbca2a..0fc71fa3 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -23,7 +23,6 @@ "chart.js": "^4.4.1", "codemirror-editor-vue3": "^2.8.0", "dayjs": "^1.11.6", - "editorjs-md-parser": "^0.0.3", "feather-icons": "^4.28.0", "frappe-ui": "^0.1.89", "lucide-vue-next": "^0.383.0", diff --git a/frontend/src/utils/index.js b/frontend/src/utils/index.js index 789005dc..ac144b8f 100644 --- a/frontend/src/utils/index.js +++ b/frontend/src/utils/index.js @@ -161,7 +161,7 @@ export function getEditorTools() { table: Table, paragraph: { class: Paragraph, - inlineToolbar: true, + inlineToolbar: false, config: { preserveBlank: true, },