Commit Graph

3716 Commits

Author SHA1 Message Date
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
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
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
Michael RICOIS
92d5474a66 Merge branch 'ticket-14698-sensefuel' into develop 2017-11-22 12:54:21 +01:00
Michael RICOIS
60f7126f42 Background 2017-11-22 12:48:38 +01:00
Michael RICOIS
364d14e73c Change display condition 2017-11-22 12:37:10 +01:00
Christophe Latour
2654289343 Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop 2017-11-22 12:18:15 +01:00
Michael RICOIS
c7168a2f2e Fix style 2017-11-22 12:18:00 +01:00
Christophe Latour
48e536da95 Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop 2017-11-22 11:34:50 +01:00
Nolwenn J
9b777fc2f4 Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop 2017-11-22 11:34:26 +01:00
Nolwenn J
9f908d09c8 Merge branch 'ticket/r14647-welcome-mail' into develop 2017-11-22 11:34:11 +01:00
Nolwenn J
bfae062c0c mails fixs 2017-11-22 11:33:50 +01:00
Christophe Latour
e212d848e6 Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop 2017-11-22 11:30:52 +01:00
Michael RICOIS
281f8399f0 Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into develop 2017-11-22 11:29:41 +01:00
Michael RICOIS
0685f70903 Merge branch 'ticket-14698-sensefuel' into develop
Conflicts:
	themes/site/css/style.css
	themes/site_mobile/css/style.css
2017-11-22 11:29:11 +01:00
Christophe Latour
9cdacee97c Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop 2017-11-22 11:13:07 +01:00
Nolwenn J
875605e6ed Merge branch 'ticket/r14647-welcome-mail' into develop 2017-11-22 11:12:53 +01:00
Nolwenn J
b46cf8580d fix mail es 2017-11-22 11:12:27 +01:00
Christophe Latour
4c119b5a57 Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop 2017-11-22 11:09:33 +01:00
Nolwenn J
ec31ea2735 Merge branch 'ticket/r14647-welcome-mail' into develop 2017-11-22 11:09:17 +01:00
Nolwenn J
2724d07b5b mails 2017-11-22 11:08:26 +01:00
Christophe Latour
c742736bb9 Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop 2017-11-22 10:50:30 +01:00
Nolwenn J
4cb0272f67 Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop 2017-11-22 10:47:28 +01:00
Nolwenn J
c4301dbac1 Merge branch 'ticket/r14647-welcome-mail' into develop 2017-11-22 10:47:06 +01:00
Nolwenn J
bbeef7850d fix 2017-11-22 10:46:35 +01:00
Christophe Latour
6e391cbeee Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop 2017-11-21 17:38:52 +01:00
Marion Muszynski
be7625d4a9 Merge branch 'ticket-14829-FixEmails' into develop 2017-11-21 17:38:43 +01:00
Marion Muszynski
577323636c fix email address when letters are missing 2017-11-21 17:38:25 +01:00
Christophe Latour
a58a964655 Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop 2017-11-21 16:20:37 +01:00