Skip to content
GitLab
Explore
Sign in
libre.sh
docker
nextcloud
Compare revisions
87e521b647d5e5f658932d60e1423b1bb0e3e2db to 05c7b82a0bf15da5215b164bc10dc8ec5a3a8348
Commits on Source (2)
feat: update to v26
· 4f9c2cee
Timothee Gosselin
authored
Sep 20, 2023
4f9c2cee
Merge branch 'feature-v26' into 'master'
· 05c7b82a
Timothee Gosselin
authored
Sep 20, 2023
Feature v26 See merge request
!28
05c7b82a
Hide whitespace changes
Inline
Side-by-side
customnav
@
e1d41ee8
Compare
b59a5e28
...
e1d41ee8
Subproject commit
b59a5e28baf48903acf1e34c8c2c9ce0fc8e8836
Subproject commit
e1d41ee8b697305981f0394b987df1c9c80ea813
base/patches/TableManager-patch.diff
deleted
100644 → 0
View file @
87e521b6
--- 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);
base/runtime/patches/multioffice/onlyoffice-l10n-fr-patch.diff
deleted
100644 → 0
View file @
87e521b6
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",
ci/functions
View file @
05c7b82a
...
@@ -13,7 +13,7 @@ function build_kaniko() {
...
@@ -13,7 +13,7 @@ function build_kaniko() {
echo $DESTINATION
echo $DESTINATION
echo $BASE_TAG
echo $BASE_TAG
echo "======"
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() {
function print_versions() {
...
...
current_version
View file @
05c7b82a
export MARKETTING_VERSION=2
5
export MARKETTING_VERSION=2
6