From 7306a31a7d472ccb3314202c4005b55cbf19da6c Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sat, 3 Jul 2021 20:32:39 +0200 Subject: [PATCH 1/8] release v1.24.0 --- appinfo/info.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appinfo/info.xml b/appinfo/info.xml index d35adbc..5faecd0 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -26,7 +26,7 @@ If you like this application and if you want to support the development: * [Donate with liberapay](https://liberapay.com/deblan) * [Leave a comment](https://apps.nextcloud.com/apps/side_menu#comments) ]]> - 1.23.1 + 1.24.0 agpl Simon Vieille SideMenu From 90280afdcbaa6be5f70fb0631c9041d60f22ca8d Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Thu, 13 Jan 2022 00:42:26 +0100 Subject: [PATCH 2/8] update dependencies --- package.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index f38078f..8a8a92a 100644 --- a/package.json +++ b/package.json @@ -24,34 +24,34 @@ "node": ">=10.0.0" }, "devDependencies": { - "@babel/core": "^7.9.0", + "@babel/core": "^7.16.7", "@babel/plugin-syntax-dynamic-import": "^7.8.3", - "@babel/preset-env": "^7.9.0", + "@babel/preset-env": "^7.16.8", "@nextcloud/browserslist-config": "^1.0.0", "babel-eslint": "^10.1.0", - "babel-loader": "^8.1.0", + "babel-loader": "^8.2.3", "css-loader": "^3.4.2", "eslint": "^5.16.0", "eslint-config-nextcloud": "0.1.1", "eslint-config-standard": "^12.0.0", - "eslint-import-resolver-webpack": "^0.12.1", - "eslint-loader": "^3.0.3", - "eslint-plugin-import": "^2.20.0", + "eslint-import-resolver-webpack": "^0.12.2", + "eslint-loader": "^3.0.4", + "eslint-plugin-import": "^2.25.4", "eslint-plugin-nextcloud": "^0.3.0", "eslint-plugin-node": "^10.0.0", - "eslint-plugin-promise": "^4.2.1", - "eslint-plugin-standard": "^4.0.1", + "eslint-plugin-promise": "^4.3.1", + "eslint-plugin-standard": "^4.1.0", "eslint-plugin-vue": "^5.2.3", - "file-loader": "^6.0.0", + "file-loader": "^6.2.0", "node-sass": "^4.13.1", "sass-loader": "^8.0.2", "stylelint": "^8.4.0", "stylelint-config-recommended-scss": "^3.3.0", - "stylelint-scss": "^3.16.0", + "stylelint-scss": "^3.21.0", "stylelint-webpack-plugin": "^0.10.5", - "url-loader": "^4.0.0", + "url-loader": "^4.1.1", "vue-loader": "^15.9.1", - "vue-template-compiler": "^2.6.11", + "vue-template-compiler": "^2.6.14", "webpack": "^4.42.0", "webpack-cli": "^3.3.11", "webpack-merge": "^4.2.2", From 5d03fbaa4948991d22e05549457d6d235ebce5b7 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Fri, 14 Jan 2022 16:44:54 +0100 Subject: [PATCH 3/8] update ci/cd conf --- .drone.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index dc4929b..11f07ce 100644 --- a/.drone.yml +++ b/.drone.yml @@ -35,13 +35,18 @@ steps: - export VERSION=$(grep "" appinfo/info.xml | grep -o "[0-9]*\.[0-9]*\.[0-9]*" --color=never) - export RELEASE_DIRECTORY="/artifacts/deblan/side_menu" - make release - when: + trigger: branch: exclude: - develop - feature/* include: - master + event: + exclude: + - pull_request + include: + - push volumes: - name: artifacts From 2d32e542cb34399b963134013d716ef1142fa3a2 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Fri, 14 Jan 2022 16:46:47 +0100 Subject: [PATCH 4/8] update ci/cd conf --- .drone.yml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.drone.yml b/.drone.yml index 11f07ce..2d488ec 100644 --- a/.drone.yml +++ b/.drone.yml @@ -37,16 +37,9 @@ steps: - make release trigger: branch: - exclude: - - develop - - feature/* - include: - - master + - master event: - exclude: - - pull_request - include: - - push + - push volumes: - name: artifacts From a913bd5ba2cdab3d8663c1d0bd7ae91f032ffa8b Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Fri, 14 Jan 2022 16:49:14 +0100 Subject: [PATCH 5/8] update ci/cd conf --- .drone.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 2d488ec..4fa0e2c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -35,9 +35,13 @@ steps: - export VERSION=$(grep "" appinfo/info.xml | grep -o "[0-9]*\.[0-9]*\.[0-9]*" --color=never) - export RELEASE_DIRECTORY="/artifacts/deblan/side_menu" - make release - trigger: + when: branch: - - master + exclude: + - develop + - feature/* + include: + - master event: - push From 59e3b6b85eb56cd2b8bca1a50bc8601ac059b422 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Fri, 14 Jan 2022 16:50:15 +0100 Subject: [PATCH 6/8] update ci/cd conf --- .drone.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.drone.yml b/.drone.yml index 4fa0e2c..90f1007 100644 --- a/.drone.yml +++ b/.drone.yml @@ -20,6 +20,9 @@ steps: include: - develop - feature/* + event: + - push + - pull_request - name: release image: deblan/devenv From 8c5b0e98343bee408a6042576cf3eb7259b80232 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Fri, 14 Jan 2022 16:52:36 +0100 Subject: [PATCH 7/8] update ci/cd conf --- .metroline.yml | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 .metroline.yml diff --git a/.metroline.yml b/.metroline.yml deleted file mode 100644 index 7917ee0..0000000 --- a/.metroline.yml +++ /dev/null @@ -1,7 +0,0 @@ -version: '1' -image: deblan/devenv -jobs: - build: - script: - - npm install - - make npm-build From d8072d8568d2dc821021bf0f62ebfaf5458c771e Mon Sep 17 00:00:00 2001 From: sergeng Date: Sun, 16 Jan 2022 16:38:02 +0100 Subject: [PATCH 8/8] Update 'lib/Service/LangRepository.php' Resolve web app BSOD giving the following error due to no proper escaping. "exception":{ + "Exception":"Doctrine\\DBAL\\Exception\\InvalidFieldNameException", + "Message":"" + An exception occurred while executing a query: SQLSTATE[42703]: Undefined column: 7 ERROR: column "lang" does not exist + LINE 1: ...configvalue FROM "oc_preferences" WHERE configkey="lang" and... Signed-off-by: sergeng --- lib/Service/LangRepository.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Service/LangRepository.php b/lib/Service/LangRepository.php index c998a7e..bc124bd 100644 --- a/lib/Service/LangRepository.php +++ b/lib/Service/LangRepository.php @@ -26,7 +26,7 @@ class LangRepository $qb = $this->db->getQueryBuilder(); $qb->select($qb->createFunction('DISTINCT configvalue')) - ->where('configkey="lang" and appid="core" and configvalue<>"en"') + ->where('configkey=\'lang\' and appid=\'core\' and configvalue<>\'en\'') ->from('preferences') ;