Commit graph

366 commits

Author SHA1 Message Date
Vincent BRIDIER
69ce45d5cb
Merge branch 'trunk' 2022-12-13 10:33:59 +01:00
Vincent BRIDIER
a6d0e1ae2d
Merge branch 'develop' into trunk 2022-12-13 10:32:56 +01:00
Vincent BRIDIER
d8464a34ac Merge branch 'evol-sh-01' into 'develop'
Evol sh 01

See merge request service-web-lab/boutique-cnc!3
2022-12-13 09:30:00 +00:00
S. Hattry
4359c85b8c Fix filter order bug 2022-12-08 09:35:28 +01:00
S. Hattry
7ba2c3b2fe Fix null order bug (review feedback) 2022-11-28 13:07:49 +01:00
S. Hattry
1f235efebe Delete comment 2022-11-28 13:07:25 +01:00
S. Hattry
6eef17a390 Add translateable title (review feedback) 2022-11-28 12:59:14 +01:00
S. Hattry
5872d670fe Add translatables column names (review feedback) 2022-11-28 12:49:10 +01:00
S. Hattry
0c22695c77 Fix type input email bug (review feedback) 2022-11-28 12:38:59 +01:00
S. Hattry
1aceb54b0e Fix contact request rule bug (review feedback) 2022-11-28 12:31:25 +01:00
S. Hattry
e9085b681a Fix canceled order mail (review feedback) 2022-11-28 12:30:40 +01:00
S. Hattry
e8d1669bae Fix contact mail bug (review feedback) 2022-11-28 12:08:55 +01:00
S. Hattry
9e7fad8ebb Fix confirm admin mail bug (review feedback) 2022-11-28 12:03:19 +01:00
S. Hattry
6b3145eb8f Fix filters orders (review feedback) 2022-11-28 11:55:25 +01:00
S. Hattry
30e53b81b3 Fix sort date bug (review feedback) 2022-11-28 11:04:22 +01:00
S. Hattry
1cca69c933 BO - Add order filters 2022-11-25 15:22:16 +01:00
S. Hattry
11dad23fe2 Add confirm admin email according to shop 2022-11-25 14:42:18 +01:00
S. Hattry
9b5a68c121 Fix magasin migration bug 2022-11-25 09:51:40 +01:00
S. Hattry
6f14d1d975 Sort orders list by desc date 2022-11-24 17:10:28 +01:00
S. Hattry
039587d1e3 Add shop email destination in form contact 2022-11-24 16:31:54 +01:00
S. Hattry
825d47797b Add cancel order button for the customer 2022-11-24 13:15:21 +01:00
Vincent BRIDIER
e1820ba1ac
Merge branch 'trunk' 2022-11-24 09:23:21 +01:00
Olivier Legat
b72988b20c Merge branch 'develop' into trunk 2022-09-12 17:02:32 +02:00
Olivier Legat
8235f134cf
mixed type in signature does not fit current server execution : fixed 2022-09-12 17:01:31 +02:00
Olivier Legat
3000e1663f Merge branch 'develop' into trunk 2022-09-12 16:31:57 +02:00
Olivier Legat
f30c6cff18
fix product associated optionnal data 2022-09-12 16:31:08 +02:00
Olivier Legat
d48c9aa99b Merge branch 'develop' into trunk 2022-09-12 08:57:51 +02:00
Olivier Legat
64868010d4
proper way for cinjecting view shares taking fresh migration into account 2022-09-11 16:40:18 +02:00
Olivier Legat
b7c0e12429 Merge branch 'trunk' 2022-09-09 08:33:17 +02:00
Olivier Legat
2d65de573c Merge branch 'develop' into trunk 2022-09-09 08:32:17 +02:00
Olivier Legat
2534188942 Merge branch 'linting-cleanup' into 'develop'
Linting cleanup

See merge request service-web-lab/boutique-cnc!1
2022-09-09 06:25:18 +00:00
Olivier Legat
16213ac4e4
ignore vscode specific settings, if need should be force added 2022-09-08 13:00:41 +02:00
Olivier Legat
6e359d3c41
fix cyclomatic complexity on product update 2022-09-05 13:17:58 +02:00
Olivier Legat
1d2300ba57
solve cyclomatic complexity in avilable creneaux retreival 2022-09-05 12:19:36 +02:00
Olivier Legat
1fc4d97657
sniffing and linting - NO refactoring 2022-09-03 16:56:16 +02:00
Vincent BRIDIER
4bbb98e3c8
Merge branch 'trunk' 2022-08-25 12:52:07 +02:00
Vincent BRIDIER
80d426f470
Merge branch 'develop' into trunk 2022-08-25 12:51:56 +02:00
Vincent BRIDIER
78b5a223a7
first clean -> 1.0.1 2022-08-25 12:26:43 +02:00
Vincent BRIDIER
7ffa7f67a6
Merge branch 'trunk' 2022-08-24 15:26:09 +02:00
Vincent BRIDIER
3ee9fa91dc
Merge branch 'develop' into trunk 2022-08-24 15:25:52 +02:00
Vincent BRIDIER
02da9c7b7d
Add CI 2022-08-24 15:25:41 +02:00
Vincent BRIDIER
b932825760
Merge branch 'develop' into trunk 2022-08-24 15:24:38 +02:00
Vincent BRIDIER
869c56445c
Merge remote-tracking branch 'origin/remove_verrues_de_recette' into develop 2022-08-24 15:22:54 +02:00
Vincent BRIDIER
7d593ec5ac
Update VSCODE config 2022-08-24 14:42:24 +02:00
S. Hattry
02cfc1982b Revert "npm audit fix --force to solve all vulnerabilities"
This reverts commit 2bb67dd42d.
2022-07-28 11:59:39 +02:00
S. Hattry
3e9428d122 Revert "PHPCS correction 1"
This reverts commit e4f00ae71c.
2022-07-28 11:57:02 +02:00
Sebastien Hattry
e4f00ae71c PHPCS correction 1 2022-07-28 09:29:34 +00:00
Sebastien Hattry
2bb67dd42d npm audit fix --force to solve all vulnerabilities 2022-07-28 08:52:28 +00:00
Olivier Legat
89fd1b8516 force https for all envs 2022-07-12 17:42:08 +02:00
Olivier Legat
ce21e69af8 Merge branch 'trunk' 2022-05-19 11:23:28 +02:00