Commit graph

473 commits

Author SHA1 Message Date
Vincent BRIDIER
643efd25af Merge branch 'issue-26' into 'develop'
fix title size - issue #26

See merge request ldc-web/projets/boutique-cnc-sable!45
2023-08-03 09:20:47 +00:00
Vincent BRIDIER
c2ff9a23b3 Merge branch 'issue-2' into 'develop'
update password validation - issue #2

See merge request ldc-web/projets/boutique-cnc-sable!44
2023-08-03 09:15:22 +00:00
Alexis Gousseau
b77cd6620b update password validation - issue #2 2023-08-03 09:15:22 +00:00
Vincent BRIDIER
8a683703ac Merge branch 'issue-8' into 'develop'
fix filters products - issue #8

See merge request ldc-web/projets/boutique-cnc-sable!42
2023-08-03 09:07:26 +00:00
Vincent BRIDIER
d68691b57c Merge branch 'issue-24' into 'develop'
disable remove product btn when click on the first time - issue #24

See merge request ldc-web/projets/boutique-cnc-sable!41
2023-08-03 09:02:36 +00:00
Vincent BRIDIER
27afc6b120
Issue 27 - Add salarie end_date management 2023-08-02 16:26:25 +02:00
Alexis Gousseau
a858298acf fix filters products - issue #8 2023-08-01 10:13:35 +02:00
Alexis Gousseau
7d14c71575 fix title size - issue #26 2023-07-31 11:35:21 +02:00
Alexis Gousseau
110ec22dd7 disable remove product btn when click on the first time - issue #24 2023-07-31 09:16:17 +02:00
Vincent BRIDIER
b746b1e968 Merge branch 'issue-23' into 'develop'
fix route - issue #23

See merge request ldc-web/projets/boutique-cnc-sable!40
2023-07-28 12:50:55 +00:00
Alexis Gousseau
86b765704e fix route + clean - issue #23 2023-07-28 12:50:55 +00:00
Vincent BRIDIER
0515eadc37 Merge branch 'issue-3' into 'develop'
add unique validation on customers email - issue #3

See merge request ldc-web/projets/boutique-cnc-sable!43
2023-07-28 12:17:36 +00:00
Alexis Gousseau
3ac56d148b add unique validation on customers email - issue #3 2023-07-28 14:14:06 +02:00
Vincent BRIDIER
b8717bc3b6
fix ts-1273 2023-07-28 11:08:48 +02:00
Vincent BRIDIER
64d2b083dd Merge branch 'issue-7' into 'develop'
update import + add export on salarie table - issue #7

See merge request ldc-web/projets/boutique-cnc-sable!19
2023-07-28 07:25:36 +00:00
Alexis Gousseau
2a1baea6c6 update import + add export on salarie table - issue #7 2023-07-28 07:25:36 +00:00
Vincent BRIDIER
3c0fc94ddd Merge branch 'issue-21' into 'develop'
add order on products table - issue #21

See merge request ldc-web/projets/boutique-cnc-sable!38
2023-07-27 10:18:36 +00:00
Vincent BRIDIER
7c753f45c6 Merge branch 'issue-25' into 'develop'
add specific custom section ckeditor - issue #25

See merge request ldc-web/projets/boutique-cnc-sable!39
2023-07-27 08:49:48 +00:00
Alexis Gousseau
44aef0da22 add specific custom section ckeditor - issue #25 2023-07-26 17:44:12 +02:00
Alexis Gousseau
591079f264 add order on products table - issue #21 2023-07-26 09:56:16 +02:00
Vincent BRIDIER
a07d87b3d1 Merge branch '9-ts-1262' into 'develop'
Resolve "ts-1262"

See merge request ldc-web/projets/boutique-cnc-sable!37
2023-07-24 09:33:48 +00:00
Nicolas Demangeat
b47e04cf26 change navbar toggler icon color to dark 2023-07-24 09:26:54 +00:00
Vincent BRIDIER
253433c7f7 Merge branch '20-ts-1275' into 'develop'
Resolve "ts-1275"

See merge request ldc-web/projets/boutique-cnc-sable!36
2023-07-21 14:23:10 +00:00
Nicolas Demangeat
e6a1c17e89 create new css rules for contact page and refactor views 2023-07-12 10:49:12 +02:00
Nicolas Demangeat
7e1c243705 update blade responsiv 2023-07-11 16:24:22 +02:00
Nicolas Demangeat
1cf5819ed4 delet class name in blade to align items left 2023-07-11 15:20:18 +02:00
Vincent BRIDIER
35b35296b3 Merge branch '22-ts-1260' into 'develop'
Resolve "ts-1260"

See merge request ldc-web/projets/boutique-cnc-sable!35
2023-07-11 11:31:26 +00:00
Nicolas Demangeat
b5067b9197 move the Cart destroy to the confirmOrder method and refactor .env 2023-07-11 13:23:27 +02:00
Vincent BRIDIER
496f789df1 Merge branch 'issue-18' into 'develop'
Reminder mail

Closes #18

See merge request ldc-web/projets/boutique-cnc-sable!31
2023-07-10 15:09:06 +00:00
noah.lancien
44f72a3259 Reminder mail 2023-07-10 15:09:06 +00:00
Vincent BRIDIER
0bb06e657b Merge branch 'first-or-fail' into 'develop'
Replace first by firstOrFail to get the first shop

See merge request ldc-web/projets/boutique-cnc-sable!34
2023-07-10 13:44:17 +00:00
Noah Lancien
17152c9285 Replace first by firstOrFail to get the first shop 2023-07-10 15:31:10 +02:00
Vincent BRIDIER
5ac79ec223 Merge branch 'issue-15' into 'develop'
Changed text when the weight is fixed

Closes #15

See merge request ldc-web/projets/boutique-cnc-sable!27
2023-07-03 09:55:45 +00:00
noah.lancien
4056846e3a Changed text when the weight is fixed 2023-07-03 09:55:45 +00:00
Vincent BRIDIER
9339397b62 Merge branch 'issue-16' into 'develop'
redirect btn account - issue #16

Closes #16

See merge request ldc-web/projets/boutique-cnc-sable!29
2023-06-30 14:39:57 +00:00
Alexis Gousseau
f207fa444f redirect btn account - issue #16 2023-06-30 16:37:42 +02:00
Vincent BRIDIER
a7d5d1ced2 Merge branch '11-ts-1266' into 'develop'
Resolve "ts-1266"

Closes #11

See merge request ldc-web/projets/boutique-cnc-sable!28
2023-06-30 14:19:29 +00:00
nicolas.demangeat
0bf505f065 add css rules to display or not the product description in home page 2023-06-30 14:19:29 +00:00
Vincent BRIDIER
210da9f000 Merge branch '17-ts-1272' into 'develop'
Resolve "ts-1272"

Closes #17

See merge request ldc-web/projets/boutique-cnc-sable!30
2023-06-30 14:14:20 +00:00
Nicolas Demangeat
8a37cae0cd change route name for charte de confidentialite 2023-06-30 14:13:01 +00:00
Vincent BRIDIER
a0c12c4c76 Merge branch '9-ts-1262' into 'develop'
change navbar items color

Closes #9

See merge request ldc-web/projets/boutique-cnc-sable!26
2023-06-30 12:33:54 +00:00
Nicolas Demangeat
1759a0e6f8 change navbar items color 2023-06-30 11:43:19 +00:00
Vincent BRIDIER
37a66626c2 Merge branch '13-ts-1273' into 'develop'
Resolve "ts-1273"

Closes #13

See merge request ldc-web/projets/boutique-cnc-sable!25
2023-06-30 10:58:21 +00:00
Nicolas Demangeat
78cfa12fbd change placeholder display for password confirmation and postal code 2023-06-30 10:56:56 +00:00
Vincent BRIDIER
bacec961a3 Merge branch 'issue-10' into 'develop'
Removed pce display from vue component

Closes #10

See merge request ldc-web/projets/boutique-cnc-sable!20
2023-06-30 10:42:00 +00:00
Vincent BRIDIER
9935384a3e Merge branch 'issue-12' into 'develop'
Products can now be published/unpublished from the index list

Closes #12

See merge request ldc-web/projets/boutique-cnc-sable!22
2023-06-30 10:41:14 +00:00
Vincent BRIDIER
2f3438d60e Merge branch 'issue-14' into 'develop'
Removed displayed map in contact page

Closes #14

See merge request ldc-web/projets/boutique-cnc-sable!23
2023-06-30 10:39:15 +00:00
Noah Lancien
c4efaf070a Removed all informations about first shop in the contact page 2023-06-30 12:37:08 +02:00
Vincent BRIDIER
c68f505113 Merge branch 'issue-8' into 'develop'
set filters products to sticky - issue #8

Closes #8

See merge request ldc-web/projets/boutique-cnc-sable!21
2023-06-30 10:32:05 +00:00
Vincent BRIDIER
4b6dfef6f5 Merge branch 'view-bug-fix' into 'develop'
bug fix display gammes-de-produit page

See merge request ldc-web/projets/boutique-cnc-sable!24
2023-06-30 10:22:35 +00:00