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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Michael RICOIS
|
77ae796785
|
Merge branch 'ticket-10393-guide-achat' into develop
|
2017-11-21 16:17:28 +01:00 |
|
Michael RICOIS
|
405708b9bc
|
Fix
|
2017-11-21 16:13:24 +01:00 |
|
Michael RICOIS
|
1934b07945
|
Image white_magnifier
|
2017-11-21 15:22:17 +01:00 |
|
Michael RICOIS
|
0e97f87299
|
Hook sensefuel
|
2017-11-21 14:55:52 +01:00 |
|
Marion Muszynski
|
c494ce1880
|
Merge branch 'refonte-adminOrderTpl' into develop
|
2017-11-21 14:28:42 +01:00 |
|
Marion Muszynski
|
b1b63b937d
|
order comes from appli information
|
2017-11-21 14:28:24 +01:00 |
|
Marion Muszynski
|
f567423f9b
|
Merge branch 'fix-cache-privatesale_family_menu'
|
2017-11-21 14:14:42 +01:00 |
|
Marion Muszynski
|
45eded0dd9
|
Merge branch 'fix-cache-privatesale_family_menu' into develop
|
2017-11-21 14:12:27 +01:00 |
|
Marion Muszynski
|
da6a162fe6
|
fix
|
2017-11-21 14:12:21 +01:00 |
|
Marion Muszynski
|
41e29a2e06
|
Merge branch 'fix-cache-privatesale_family_menu' into develop
|
2017-11-21 14:10:24 +01:00 |
|
Marion Muszynski
|
15108dcd34
|
add cache for bestsellers
|
2017-11-21 14:10:00 +01:00 |
|
Michael RICOIS
|
0597685e56
|
Remove debug
|
2017-11-21 11:14:16 +01:00 |
|
Michael RICOIS
|
ac1e7b89ee
|
Fix breadcrumb
|
2017-11-21 11:13:15 +01:00 |
|
Michael RICOIS
|
3a058c3096
|
Merge branch 'ticket-14525-parrain'
|
2017-11-21 10:37:22 +01:00 |
|
Michael RICOIS
|
99b6ff6bcb
|
Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into develop
|
2017-11-21 10:36:29 +01:00 |
|
Michael RICOIS
|
b2abb181fe
|
Merge branch 'ticket-14525-parrain' into develop
|
2017-11-21 10:36:00 +01:00 |
|
Michael RICOIS
|
e580048c80
|
Fix condition to update properly sponsor with order or not
|
2017-11-21 10:35:23 +01:00 |
|
Nolwenn J
|
1d9e4ca139
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-11-21 10:31:48 +01:00 |
|
Nolwenn J
|
178097efb4
|
Merge branch 'ticket/r14647-welcome-mail' into develop
|
2017-11-21 10:31:34 +01:00 |
|
Nolwenn J
|
b9025b2883
|
chge image pour eviter les caches gmail
|
2017-11-21 10:31:13 +01:00 |
|
Michael RICOIS
|
6f35329b24
|
Force adding categories (product_type)
|
2017-11-21 10:23:53 +01:00 |
|
Marion Muszynski
|
331d3f6ded
|
Merge branch 'fix-cache-privatesale_family_menu'
|
2017-11-21 10:22:46 +01:00 |
|
Marion Muszynski
|
273544ed4f
|
Merge branch 'fix-cache-privatesale_family_menu' into develop
|
2017-11-21 10:21:33 +01:00 |
|
Marion Muszynski
|
acbc72a32c
|
fix name of key
|
2017-11-21 10:21:19 +01:00 |
|
Michael RICOIS
|
1234f7848d
|
Fix blocklinkmulti
|
2017-11-21 10:00:56 +01:00 |
|
Michael RICOIS
|
097ecc3937
|
Add mobile view for purchase guide
|
2017-11-21 09:28:02 +01:00 |
|
Nolwenn J
|
5be6300e52
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-11-20 18:55:19 +01:00 |
|
Nolwenn J
|
77206e7393
|
Merge branch 'ticket/r14647-welcome-mail' into develop
|
2017-11-20 18:55:01 +01:00 |
|
Nolwenn J
|
8c420adee9
|
mails
|
2017-11-20 18:54:42 +01:00 |
|
Michael RICOIS
|
8b0a6077da
|
Style
|
2017-11-20 17:35:43 +01:00 |
|
Michael RICOIS
|
abee1a1059
|
Rewrite SQL
|
2017-11-20 17:35:23 +01:00 |
|
Marion Muszynski
|
f6944a411d
|
Merge branch 'fix-cache-privatesale_family_menu' into develop
|
2017-11-20 17:21:33 +01:00 |
|
Marion Muszynski
|
b6283cf4ae
|
fix futur sale query
|
2017-11-20 17:21:20 +01:00 |
|
Marion Muszynski
|
27659bb7b9
|
Merge branch 'fix-cache-privatesale_family_menu' into develop
|
2017-11-20 17:13:13 +01:00 |
|
Marion Muszynski
|
446308d40c
|
cache privatesale menu
|
2017-11-20 17:12:58 +01:00 |
|
Nolwenn J
|
25f7394691
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-11-20 16:59:50 +01:00 |
|
Nolwenn J
|
8783fe760d
|
Merge branch 'ticket/r14647-welcome-mail' into develop
|
2017-11-20 16:59:36 +01:00 |
|
Nolwenn J
|
0b6c2a1533
|
fixs
|
2017-11-20 16:59:01 +01:00 |
|
Michael RICOIS
|
b996521fcb
|
404
|
2017-11-20 14:54:19 +01:00 |
|