Christophe LATOUR
|
8ef9b301ca
|
adding comment
|
2017-11-24 16:37:42 +01:00 |
|
Christophe Latour
|
f78296570e
|
Merge branch 'feature/override_object_model' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-11-24 16:25:34 +01:00 |
|
Christophe LATOUR
|
283457bd5c
|
Overriding Objectmodel :
- replace self with static to be able to override displayFieldName
|
2017-11-24 16:24:38 +01:00 |
|
Christophe Latour
|
24d1240695
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-11-23 17:08:55 +01:00 |
|
Marion Muszynski
|
62d914f7b7
|
Merge branch 'ticket-14836-refonteProductMobile' into develop
|
2017-11-23 17:08:45 +01:00 |
|
Marion Muszynski
|
1932ff578d
|
fix inte on product page
|
2017-11-23 17:08:29 +01:00 |
|
Christophe Latour
|
1190f94a5a
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-11-23 16:51:28 +01:00 |
|
Michael RICOIS
|
c9a8928a81
|
Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into develop
|
2017-11-23 16:51:17 +01:00 |
|
Michael RICOIS
|
b31246f357
|
Merge branch 'ticket-10393-guide-achat' into develop
|
2017-11-23 16:50:34 +01:00 |
|
Christophe Latour
|
ea5d7238b2
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-11-23 16:50:18 +01:00 |
|
Marion Muszynski
|
8d4ab27d6f
|
Merge branch 'ticket-14836-refonteProductMobile' into develop
|
2017-11-23 16:50:08 +01:00 |
|
Marion Muszynski
|
64251e2fb9
|
addition of fonts
|
2017-11-23 16:49:57 +01:00 |
|
Michael RICOIS
|
c50659be85
|
Better detection if is employee
|
2017-11-23 16:49:03 +01:00 |
|
Marion Muszynski
|
01dd1300b1
|
Merge branch 'ticket-14836-refonteProductMobile' into develop
|
2017-11-23 16:49:02 +01:00 |
|
Marion Muszynski
|
cfed6df5d4
|
inte for site_mobile theme
|
2017-11-23 16:48:44 +01:00 |
|
Christophe Latour
|
2ee70ed4e5
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-11-23 15:32:23 +01:00 |
|
Marion Muszynski
|
a846de99eb
|
Merge branch 'ticket-14828-ChangeIdContactDynamically' into develop
|
2017-11-23 15:32:07 +01:00 |
|
Marion Muszynski
|
58a1710ea2
|
check if order is sended and change id contact accordingly
|
2017-11-23 15:31:47 +01:00 |
|
Christophe Latour
|
dd867a7017
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-11-23 15:18:31 +01:00 |
|
Michael RICOIS
|
a2bc1c00fa
|
Conflit
|
2017-11-23 15:17:37 +01:00 |
|
Michael RICOIS
|
33c73c05ac
|
Merge branch 'ticket-10393-guide-achat' into develop
Conflicts:
themes/site/css/style.css
|
2017-11-23 15:14:02 +01:00 |
|
Michael RICOIS
|
9acc6e29d5
|
Order
|
2017-11-23 15:08:15 +01:00 |
|
root
|
59f0826643
|
fixes for philea from prod
|
2017-11-23 15:06:35 +01:00 |
|
root
|
78bd7eb479
|
fixes from prod
|
2017-11-23 15:05:07 +01:00 |
|
Christophe Latour
|
43a5ab1724
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-11-23 11:44:19 +01:00 |
|
Michael RICOIS
|
3d2feabfca
|
Merge branch 'ticket-14698-sensefuel' into develop
|
2017-11-23 11:44:04 +01:00 |
|
Michael RICOIS
|
76b471851d
|
Style
|
2017-11-23 11:43:08 +01:00 |
|
Michael RICOIS
|
5a91df071e
|
Active sensefuel on all pages
|
2017-11-23 11:42:55 +01:00 |
|
Christophe Latour
|
fb5ccd4e58
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-11-23 11:11:02 +01:00 |
|
Marion Muszynski
|
0666c0eaec
|
Merge branch 'ticket-14829-FixEmails' into develop
|
2017-11-23 11:10:42 +01:00 |
|
Marion Muszynski
|
4044bc329c
|
add email fixes
|
2017-11-23 11:10:24 +01:00 |
|
Michael RICOIS
|
e2335e71b7
|
Fix cookie
|
2017-11-23 10:52:12 +01:00 |
|
Christophe Latour
|
6da250d3c2
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-11-23 09:37:54 +01:00 |
|
Michael RICOIS
|
be0cb15dee
|
Merge branch 'ticket-14698-sensefuel' into develop
|
2017-11-23 09:37:23 +01:00 |
|
Michael RICOIS
|
11c352a89d
|
Centrage
|
2017-11-22 18:22:34 +01:00 |
|
Christophe Latour
|
78b67ee742
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-11-22 17:46:37 +01:00 |
|
Michael RICOIS
|
68e2affa4e
|
Merge branch 'ticket-14698-sensefuel' into develop
|
2017-11-22 17:46:21 +01:00 |
|
Michael RICOIS
|
a2bebdb825
|
Style
|
2017-11-22 17:45:40 +01:00 |
|
Marion Muszynski
|
3f9a62487a
|
Merge branch 'ticket-14436-WP'
|
2017-11-22 16:33:45 +01:00 |
|
Christophe Latour
|
04bae74984
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-11-22 16:32:48 +01:00 |
|
Marion Muszynski
|
0e0892258d
|
Merge branch 'ticket-14436-WP' into develop
|
2017-11-22 16:32:13 +01:00 |
|
Marion Muszynski
|
8ae9fb7dd2
|
fix
|
2017-11-22 16:31:51 +01:00 |
|
Michael RICOIS
|
eaef2702d2
|
Place holder
|
2017-11-22 15:00:01 +01:00 |
|
Christophe Latour
|
80f78c7523
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-11-22 14:45:36 +01:00 |
|
Michael RICOIS
|
e7d499f97f
|
Merge branch 'ticket-14698-sensefuel' into develop
|
2017-11-22 14:45:17 +01:00 |
|
Michael RICOIS
|
bbe1ec73e2
|
Breadcrumb
|
2017-11-22 14:44:25 +01:00 |
|
Christophe Latour
|
501e343624
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-11-22 13:05:50 +01:00 |
|
Michael RICOIS
|
ba766c272d
|
Merge branch 'ticket-14698-sensefuel' into develop
|
2017-11-22 13:05:40 +01:00 |
|
Michael RICOIS
|
56806d37df
|
Style to display background
|
2017-11-22 13:03:23 +01:00 |
|
Christophe Latour
|
b3caa027b4
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-11-22 12:54:51 +01:00 |
|