Compare commits

...
Sign in to create a new pull request.

34 commits

Author SHA1 Message Date
d8072d8568 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 <sergeng@yahoo.fr>
2022-01-16 16:38:02 +01:00
4e21020600 Merge pull request 'develop' (#92) from develop into master
Reviewed-on: deblan/side_menu#92
2022-01-14 17:03:28 +01:00
8c5b0e9834 update ci/cd conf 2022-01-14 16:52:36 +01:00
59e3b6b85e update ci/cd conf 2022-01-14 16:50:15 +01:00
a913bd5ba2 update ci/cd conf 2022-01-14 16:49:14 +01:00
2d32e542cb update ci/cd conf 2022-01-14 16:46:47 +01:00
5d03fbaa49 update ci/cd conf 2022-01-14 16:44:54 +01:00
22011cb681 Merge pull request 'update the ci/cd config and screenshots' (#91) from develop into master
Reviewed-on: deblan/side_menu#91
2022-01-13 00:47:43 +01:00
1e68d6877d Merge pull request 'Quick fix' (#90) from develop into master
Reviewed-on: deblan/side_menu#90
2022-01-12 14:13:08 +01:00
68123ed45c Merge pull request 'Quick fix (#88)' (#89) from develop into master
Reviewed-on: deblan/side_menu#89
2022-01-12 13:32:29 +01:00
fef936bef0 Merge pull request 'Issues #82 #83' (#87) from develop into master
Reviewed-on: deblan/side_menu#87
2022-01-12 12:53:54 +01:00
9871cb93d8 Merge pull request 'develop' (#86) from develop into master
Reviewed-on: deblan/side_menu#86
2022-01-10 15:07:07 +01:00
2e8bed4531 Merge pull request 'update changelog' (#81) from develop into master
Reviewed-on: deblan/side_menu#81
2021-12-03 14:15:36 +01:00
134148c6b2 Merge pull request 'release v2.1.0 (NC23 is compatible)' (#80) from develop into master
Reviewed-on: deblan/side_menu#80
2021-12-03 14:03:10 +01:00
7f33f7523f Merge pull request 'Release 2.0.1' (#79) from develop into master
Reviewed-on: deblan/side_menu#79
2021-11-14 20:07:41 +01:00
70caa80af6 Merge pull request 'update makefile for assets build' (#75) from develop into master
Reviewed-on: deblan/side_menu#75
2021-11-14 17:33:55 +01:00
6296c1c807 Merge pull request 'Release v2.0.0' (#74) from develop into master
Reviewed-on: deblan/side_menu#74
2021-11-14 17:22:49 +01:00
74d26106dc Merge pull request 'add ci/cd conf' (#72) from develop into master
Reviewed-on: deblan/side_menu#72
2021-11-03 20:04:03 +01:00
ff5ba04217 Merge pull request 'add ci/cd conf (drone)' (#71) from develop into master
Reviewed-on: deblan/side_menu#71
2021-11-03 19:20:36 +01:00
240b564e22 Merge pull request 'update documentation' (#70) from develop into master
Reviewed-on: deblan/side_menu#70
2021-10-31 19:44:17 +01:00
0608011d80 Merge pull request 'update metroline conf file' (#69) from develop into master
Reviewed-on: deblan/side_menu#69
2021-10-31 18:45:36 +01:00
1544b28b57 Merge pull request 'add ci configuration' (#68) from develop into master
Reviewed-on: deblan/side_menu#68
2021-10-31 17:47:47 +01:00
1e64b34cff Merge branch 'develop' 2021-10-28 13:17:04 +02:00
cc71fda3b0 Merge branch 'develop' 2021-10-21 21:43:51 +02:00
fd367fe2d4 Merge branch 'develop' 2021-10-21 21:37:40 +02:00
3f590a97bc Merge branch 'develop' 2021-10-21 20:06:41 +02:00
aac9f2cb16 Merge branch 'develop' 2021-08-11 11:58:25 +02:00
f7d4a8284b Merge branch 'develop' 2021-08-02 21:49:02 +02:00
04d161ad9b Merge branch 'develop' 2021-07-09 12:55:07 +02:00
dab5566be4 Merge branch 'develop' 2021-07-09 12:54:32 +02:00
d735e1cfa6 Merge branch 'develop' 2021-07-09 12:43:01 +02:00
96a4235a10 Merge branch 'develop' 2021-07-09 11:52:28 +02:00
4413623618 merge develop 2021-07-07 21:36:02 +02:00
7306a31a7d release v1.24.0 2021-07-03 20:32:39 +02:00
3 changed files with 6 additions and 8 deletions

View file

@ -20,6 +20,9 @@ steps:
include: include:
- develop - develop
- feature/* - feature/*
event:
- push
- pull_request
- name: release - name: release
image: deblan/devenv image: deblan/devenv
@ -42,6 +45,8 @@ steps:
- feature/* - feature/*
include: include:
- master - master
event:
- push
volumes: volumes:
- name: artifacts - name: artifacts

View file

@ -1,7 +0,0 @@
version: '1'
image: deblan/devenv
jobs:
build:
script:
- npm install
- make npm-build

View file

@ -26,7 +26,7 @@ class LangRepository
$qb = $this->db->getQueryBuilder(); $qb = $this->db->getQueryBuilder();
$qb->select($qb->createFunction('DISTINCT configvalue')) $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') ->from('preferences')
; ;