David
|
059d483841
|
Merge branch 'ticket-14826-fix-product-title' into develop
|
2018-01-02 12:36:44 +01:00 |
|
David
|
306858b179
|
css fix
|
2018-01-02 11:58:33 +01:00 |
|
David
|
c71c1e7712
|
Merge branch 'ticket-14826-fix-product-title' into develop
# Conflicts:
# themes/site_mobile/product-list.tpl
|
2018-01-02 11:52:06 +01:00 |
|
David
|
4664d8f6fa
|
attempt at correccting ajax add to cart
|
2018-01-02 11:51:07 +01:00 |
|
Michael RICOIS
|
ad47f0c1f6
|
Merge branch 'ticket/r15251-limit_etagere' into develop
|
2018-01-02 10:30:11 +01:00 |
|
Michael RICOIS
|
07cea80436
|
Increase "emplacement" limit
|
2018-01-02 10:28:59 +01:00 |
|
David
|
2d84b8127e
|
Merge branch 'ticket-14826-fix-product-title' into develop
# Conflicts:
# themes/site_mobile/css/style.css
# themes/site_mobile/product-list.tpl
|
2017-12-29 18:25:28 +01:00 |
|
David
|
44da8e13b1
|
Additionnal information will not break the template anymore
|
2017-12-29 18:22:13 +01:00 |
|
David
|
392bccd110
|
Merge branch 'ticket/r15172-change-adress-socol' into develop
|
2017-12-29 18:13:34 +01:00 |
|
David
|
0868abc8ea
|
no more checking for change
|
2017-12-29 18:12:55 +01:00 |
|
David
|
657b39d532
|
Merge branch 'ticket/r15172-change-adress-socol' into develop
# Conflicts:
# adm/tabs/AdminOrders.php
|
2017-12-29 15:55:01 +01:00 |
|
David
|
de0efe93eb
|
Added modification button display in all conditions.
|
2017-12-29 15:52:23 +01:00 |
|
David
|
5b2ee8b7aa
|
Merge branch 'ticket-14826-fix-product-title'
|
2017-12-29 13:04:30 +01:00 |
|
David
|
5d1065ab7e
|
Merge branch 'ticket-14826-fix-product-title' into develop
|
2017-12-29 12:20:39 +01:00 |
|
David
|
b8612b7dfd
|
product title is longer in async product list
|
2017-12-29 12:19:17 +01:00 |
|
David
|
fc4f66c0cf
|
Merge branch 'fix/paybox-dec-2017' into develop
|
2017-12-22 15:10:00 +01:00 |
|
David
|
f5f52de382
|
switched emails
|
2017-12-22 15:08:14 +01:00 |
|
Michael RICOIS
|
c09890dea8
|
Merge branch 'fix/order' into develop
|
2017-12-22 14:42:49 +01:00 |
|
Michael RICOIS
|
c75f641567
|
Fix order on mobile website. appli is not a bool
|
2017-12-22 14:42:19 +01:00 |
|
Michael RICOIS
|
5acba9c265
|
Fix order mobile
|
2017-12-22 12:51:26 +01:00 |
|
Michael RICOIS
|
fe49739aa4
|
Merge branch 'fix/smartbanner'
|
2017-12-21 17:00:38 +01:00 |
|
Michael RICOIS
|
3a5c74c325
|
Merge remote-tracking branch 'origin/ticket/14716-order-mobile'
|
2017-12-21 16:56:29 +01:00 |
|
Michael RICOIS
|
4ee4994d33
|
Merge branch 'ticket/r15224-balises' into develop
|
2017-12-21 16:46:02 +01:00 |
|
Michael RICOIS
|
58d0028c22
|
Use $_REQUEST to not double
|
2017-12-21 16:44:50 +01:00 |
|
Michael RICOIS
|
c4c97cb837
|
Merge branch 'fix/smartbanner' into develop
|
2017-12-21 15:59:48 +01:00 |
|
Michael RICOIS
|
e56e0fd53f
|
Delete old smartbanner
|
2017-12-21 15:59:20 +01:00 |
|
Michael RICOIS
|
78c1c15990
|
Merge branch 'fix/smartbanner' into develop
|
2017-12-21 15:56:46 +01:00 |
|
Michael RICOIS
|
e12922da5c
|
New smartbanner
|
2017-12-21 15:51:21 +01:00 |
|
Michael RICOIS
|
3dd620e9e9
|
Merge remote-tracking branch 'origin/master' into develop
|
2017-12-21 15:20:50 +01:00 |
|
Michael RICOIS
|
c650ee706c
|
Display EDIT
|
2017-12-21 15:10:45 +01:00 |
|
Michael RICOIS
|
6ab4df6b66
|
Merge remote-tracking branch 'origin/ticket/r15172-change-adress-socol' into develop
|
2017-12-21 12:36:32 +01:00 |
|
Michael RICOIS
|
81b74686cf
|
Remove invoice change
|
2017-12-21 12:34:58 +01:00 |
|
Michael RICOIS
|
cd393096c4
|
Merge branch 'ticket/r15172-change-adress-socol' into develop
|
2017-12-21 12:08:29 +01:00 |
|
Michael RICOIS
|
ab11871b99
|
CS
|
2017-12-21 12:07:40 +01:00 |
|
Michael RICOIS
|
422f7e9820
|
Merge branch 'ticket/r15172-change-adress-socol' into develop
|
2017-12-21 11:53:06 +01:00 |
|
Michael RICOIS
|
e200eb6c6f
|
Fix bug presta afterUpdate
|
2017-12-21 11:49:19 +01:00 |
|
Michael RICOIS
|
bbf2698b31
|
Merge branch 'ticket/r15172-change-adress-socol' into develop
|
2017-12-21 10:13:31 +01:00 |
|
Michael RICOIS
|
5e3c35b95b
|
Modification et affichage adresse socolissimo lorsque livraison domicile
|
2017-12-21 10:12:16 +01:00 |
|
Michael RICOIS
|
ac36ae8bac
|
Merge branch 'fix/suspect_with_other_domain' into develop
|
2017-12-20 14:25:01 +01:00 |
|
Michael RICOIS
|
5eb320c4de
|
Ajout exclusion
|
2017-12-20 11:52:56 +01:00 |
|
Michael RICOIS
|
07b607cfc2
|
Merge remote-tracking branch 'origin/ticket/15014-invite_credits'
|
2017-12-20 11:04:41 +01:00 |
|
Michael RICOIS
|
1116cb292f
|
Merge remote-tracking branch 'origin/ticket/r15128-sponsor'
|
2017-12-20 11:03:07 +01:00 |
|
David
|
a04d0712cb
|
Merge remote-tracking branch 'origin/develop' into develop
|
2017-12-18 15:55:59 +01:00 |
|
David
|
e2a6393cea
|
Merge branch 'ticket-14826-fix-product-title' into develop
|
2017-12-18 15:55:23 +01:00 |
|
David
|
9e25127b26
|
fix
|
2017-12-18 15:54:59 +01:00 |
|
Michael RICOIS
|
15ac61838b
|
Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into develop
|
2017-12-18 15:53:57 +01:00 |
|
Michael RICOIS
|
3c2e01149c
|
Merge branch 'ticket/14716-order-mobile' into develop
|
2017-12-18 15:53:45 +01:00 |
|
David
|
8e74921024
|
Merge branch 'ticket-14826-fix-product-title' into develop
|
2017-12-18 15:51:07 +01:00 |
|
Michael RICOIS
|
05e9556730
|
color for icon
|
2017-12-18 15:39:30 +01:00 |
|
Michael RICOIS
|
411bf136e5
|
Use font icon
|
2017-12-18 15:26:56 +01:00 |
|