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 |
|
David
|
1376e0af07
|
Product name is longer in product list and product page
|
2017-12-18 15:12:38 +01:00 |
|
Michael RICOIS
|
829473cb9f
|
Merge remote-tracking branch 'origin/ticket/r15128-sponsor' into develop
|
2017-12-18 14:52:07 +01:00 |
|
Michael RICOIS
|
326de6a61f
|
Review how cookie works
|
2017-12-18 14:39:57 +01:00 |
|
Michael RICOIS
|
1293f573b6
|
CS
|
2017-12-18 12:47:38 +01:00 |
|
David
|
c80e60272c
|
Merge branch 'fix/smartbanner' into develop
|
2017-12-18 12:46:47 +01:00 |
|
Michael RICOIS
|
02ddea5e16
|
Try to redefine cooki if sponsor has changed
|
2017-12-18 12:46:16 +01:00 |
|
David
|
3355f94386
|
Fixed jquery compatibility
|
2017-12-18 12:09:50 +01:00 |
|
Michael RICOIS
|
08f522bc36
|
Debug, CS
|
2017-12-18 12:08:24 +01:00 |
|
Michael RICOIS
|
fc5991dce9
|
Delete
|
2017-12-18 09:49:22 +01:00 |
|
Michael RICOIS
|
1e14e2b6d1
|
Merge branch 'ticket/14716-order-mobile' into develop
|
2017-12-18 09:45:48 +01:00 |
|
Michael RICOIS
|
781f0c10d7
|
CS
|
2017-12-18 09:44:27 +01:00 |
|
Michael RICOIS
|
343bd39c20
|
Remove condition on data
|
2017-12-18 09:44:12 +01:00 |
|
Michael RICOIS
|
08ef1c0733
|
Merge branch 'ticket/14716-order-mobile' into develop
|
2017-12-18 09:36:41 +01:00 |
|
Michael RICOIS
|
654ffe1401
|
Remove col definition in class
|
2017-12-18 09:35:02 +01:00 |
|
Michael RICOIS
|
3fcceacb79
|
Merge branch 'ticket/14716-order-mobile' into develop
|
2017-12-15 15:55:23 +01:00 |
|
Michael RICOIS
|
d5b292d911
|
Use appli col in ps_orders to know if the order is passed on mobile
website
|
2017-12-15 15:52:02 +01:00 |
|
Michael RICOIS
|
055a403a6e
|
Add mobile flag
|
2017-12-15 14:35:53 +01:00 |
|
Michael RICOIS
|
4191450e7b
|
Add flag to see if order is mobile
|
2017-12-15 13:11:54 +01:00 |
|
Michael RICOIS
|
19a7b71030
|
Merge branch 'ticket/15116-nous-contacter-display'
|
2017-12-14 09:40:01 +01:00 |
|
Michael RICOIS
|
ad584e21e0
|
Merge branch 'ticket-14698-sensefuel'
|
2017-12-13 17:57:49 +01:00 |
|
Michael RICOIS
|
f939fe0928
|
Merge branch 'ticket/15116-nous-contacter-display' into develop
|
2017-12-13 16:20:02 +01:00 |
|
Michael RICOIS
|
517ae660e7
|
set form class to std
|
2017-12-13 16:14:04 +01:00 |
|
Michael RICOIS
|
f73558c4d7
|
Merge branch 'feature/appmobile'
|
2017-12-13 15:00:09 +01:00 |
|
Michael RICOIS
|
95e98234e3
|
Merge branch 'feature/appmobile' into develop
|
2017-12-13 14:54:20 +01:00 |
|
Michael RICOIS
|
29aa020049
|
SmartBanner as bricoprive.com
|
2017-12-13 14:53:48 +01:00 |
|
Michael RICOIS
|
9f2f53ce16
|
Merge branch 'feature/appmobile' into develop
|
2017-12-13 13:07:06 +01:00 |
|
Michael RICOIS
|
ea28f83b52
|
Add smartbanner
|
2017-12-13 13:06:33 +01:00 |
|
Michael RICOIS
|
80c97d2867
|
Add hidden field to mobile
|
2017-12-13 11:49:06 +01:00 |
|
Michael RICOIS
|
6927c87ce0
|
Fill email2
|
2017-12-13 11:43:33 +01:00 |
|
Michael RICOIS
|
f51bcf62c9
|
Add hidden field for spam
|
2017-12-13 11:34:56 +01:00 |
|
Michael RICOIS
|
e5f83c46b4
|
Add invisible field
|
2017-12-13 11:29:56 +01:00 |
|
Michael RICOIS
|
d77173316f
|
Merge branch 'feature/appmobile'
|
2017-12-13 10:36:10 +01:00 |
|
Michael RICOIS
|
f7d5610f35
|
Merge branch 'feature/appmobile' into develop
|
2017-12-13 10:23:49 +01:00 |
|