From 54e6ec94665d8eb201c00a64109ca342c44d4f24 Mon Sep 17 00:00:00 2001 From: unteem Date: Wed, 23 Aug 2023 14:07:20 +0200 Subject: [PATCH 1/3] feat: bump version to 26 --- current_version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/current_version b/current_version index a2e8c8a..cbc110f 100644 --- a/current_version +++ b/current_version @@ -1 +1 @@ -export MARKETTING_VERSION=25 +export MARKETTING_VERSION=26 -- GitLab From f8e0f03e7c6130e254e5e814dc19d5ca267ad969 Mon Sep 17 00:00:00 2001 From: Hugo Renard Date: Mon, 18 Sep 2023 15:26:29 +0200 Subject: [PATCH 2/3] feat: update custom nav --- base/apps/customnav | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/apps/customnav b/base/apps/customnav index b59a5e2..e1d41ee 160000 --- a/base/apps/customnav +++ b/base/apps/customnav @@ -1 +1 @@ -Subproject commit b59a5e28baf48903acf1e34c8c2c9ce0fc8e8836 +Subproject commit e1d41ee8b697305981f0394b987df1c9c80ea813 -- GitLab From 3dec26da778084cac17b4d76db35cbdd205bea5e Mon Sep 17 00:00:00 2001 From: Hugo Renard Date: Mon, 18 Sep 2023 18:15:17 +0200 Subject: [PATCH 3/3] fix: remove old patches --- base/patches/TableManager-patch.diff | 25 --------------- .../multioffice/onlyoffice-l10n-fr-patch.diff | 32 ------------------- ci/functions | 2 +- 3 files changed, 1 insertion(+), 58 deletions(-) delete mode 100644 base/patches/TableManager-patch.diff delete mode 100644 base/runtime/patches/multioffice/onlyoffice-l10n-fr-patch.diff diff --git a/base/patches/TableManager-patch.diff b/base/patches/TableManager-patch.diff deleted file mode 100644 index 600b3da..0000000 --- a/base/patches/TableManager-patch.diff +++ /dev/null @@ -1,25 +0,0 @@ ---- apps/polls/lib/Db/TableManager.php 2023-06-21 12:38:02.300193982 +0200 -+++ apps/polls/lib/Db/TableManager-patched.php 2023-06-21 12:48:45.144957659 +0200 -@@ -312,12 +312,18 @@ - if ($this->schema->hasTable($this->dbPrefix . $table)) { - // identify duplicates - $selection = $qb->selectDistinct('t1.id') -- ->from($table, 't1') -- ->innerJoin('t1', $table, 't2') -- ->where($qb->expr()->lt('t1.id', 't2.id')); -+ ->from($table, 't1') -+ ->innerJoin('t1', $table, 't2', $qb->expr()->lt('t1.id', 't2.id')); -+ -+ $i = 0; - - foreach ($columns as $column) { -- $selection->andWhere($qb->expr()->eq('t1.' . $column, 't2.' . $column)); -+ if ($i > 0) { -+ $selection->andWhere($qb->expr()->eq('t1.' . $column, 't2.' . $column)); -+ } else { -+ $selection->where($qb->expr()->eq('t1.' . $column, 't2.' . $column)); -+ } -+ $i++; - } - - $duplicates = $qb->executeQuery()->fetchAll(PDO::FETCH_COLUMN); diff --git a/base/runtime/patches/multioffice/onlyoffice-l10n-fr-patch.diff b/base/runtime/patches/multioffice/onlyoffice-l10n-fr-patch.diff deleted file mode 100644 index 10ee32a..0000000 --- a/base/runtime/patches/multioffice/onlyoffice-l10n-fr-patch.diff +++ /dev/null @@ -1,32 +0,0 @@ -diff '--color=auto' --text --unified --new-file -r apps/onlyoffice/l10n/fr.js apps/onlyoffice-patched/l10n/fr.js ---- apps/onlyoffice/l10n/fr.js 2021-12-13 20:06:03.417828731 +0100 -+++ apps/onlyoffice-patched/l10n/fr.js 2021-12-13 20:07:01.890000000 +0100 -@@ -24,9 +24,9 @@ - "File created" : "Fichier créé", - "Open in ONLYOFFICE" : "Ouvrir dans ONLYOFFICE", - "Convert with ONLYOFFICE" : "Convertir avec ONLYOFFICE", -- "Document" : "Document", -- "Spreadsheet" : "Feuille de calcul", -- "Presentation" : "Présentation", -+ "Document" : "Nouveau document", -+ "Spreadsheet" : "Nouvelle feuille de calcul", -+ "Presentation" : "Nouvelle présentation", - "Error when trying to connect" : "Erreur durant la tentative de connexion", - "Settings have been successfully updated" : "Les paramètres ont été mis à jour avec succès", - "Server can't read xml" : "Le serveur ne peut pas lire le XML", -diff '--color=auto' --text --unified --new-file -r apps/onlyoffice/l10n/fr.json apps/onlyoffice-patched/l10n/fr.json ---- apps/onlyoffice/l10n/fr.json 2021-12-13 20:06:03.417828731 +0100 -+++ apps/onlyoffice-patched/l10n/fr.json 2021-12-13 20:09:57.832477970 +0100 -@@ -22,9 +22,9 @@ - "File created" : "Fichier créé", - "Open in ONLYOFFICE" : "Ouvrir dans ONLYOFFICE", - "Convert with ONLYOFFICE" : "Convertir avec ONLYOFFICE", -- "Document" : "Document", -- "Spreadsheet" : "Feuille de calcul", -- "Presentation" : "Présentation", -+ "Document" : "Nouveau document", -+ "Spreadsheet" : "Nouvelle feuille de calcul", -+ "Presentation" : "Nouvelle présentation", - "Error when trying to connect" : "Erreur durant la tentative de connexion", - "Settings have been successfully updated" : "Les paramètres ont été mis à jour avec succès", - "Server can't read xml" : "Le serveur ne peut pas lire le XML", diff --git a/ci/functions b/ci/functions index 2486bef..1b2e777 100644 --- a/ci/functions +++ b/ci/functions @@ -13,7 +13,7 @@ function build_kaniko() { echo $DESTINATION echo $BASE_TAG echo "======" - /kaniko/executor --context ${CONTEXT} ${DESTINATION} --build-arg MARKETTING_VERSION=$MARKETTING_VERSION --build-arg MINOR_VERSION=$MINOR_VERSION --build-arg PATCH_VERSION=$PATCH_VERSION --build-arg BASE_TAG=$BASE_TAG + /kaniko/executor --cache --context ${CONTEXT} ${DESTINATION} --build-arg MARKETTING_VERSION=$MARKETTING_VERSION --build-arg MINOR_VERSION=$MINOR_VERSION --build-arg PATCH_VERSION=$PATCH_VERSION --build-arg BASE_TAG=$BASE_TAG } function print_versions() { -- GitLab