Michael RICOIS
|
ccbaea306d
|
Merge branch 'ticket-14273-voucher' into develop
|
2017-10-27 15:46:59 +02:00 |
|
Michael RICOIS
|
3693455509
|
FR lang
|
2017-10-27 15:46:29 +02:00 |
|
Christophe Latour
|
eedf758df6
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-10-27 15:21:45 +02:00 |
|
Michael RICOIS
|
4af87fd2ec
|
Merge branch 'ticket-14273-voucher' into develop
|
2017-10-27 15:21:23 +02:00 |
|
Michael RICOIS
|
6b15c279b9
|
Date
|
2017-10-27 15:20:43 +02:00 |
|
Christophe Latour
|
fa991e3aef
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-10-27 14:48:33 +02:00 |
|
Michael RICOIS
|
0716c6a878
|
Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into develop
|
2017-10-27 14:46:59 +02:00 |
|
Michael RICOIS
|
7854985496
|
Merge branch 'ticket-14273-voucher' into develop
|
2017-10-27 14:46:36 +02:00 |
|
Michael RICOIS
|
d193722c18
|
Change date calc
|
2017-10-27 14:45:36 +02:00 |
|
Christophe Latour
|
c76b22ec26
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-10-27 13:16:30 +02:00 |
|
Marion Muszynski
|
c3ea5cd75f
|
Merge branch 'ticket-14436-WP' into develop
|
2017-10-27 13:16:11 +02:00 |
|
Marion Muszynski
|
b6700ea7ce
|
add module
|
2017-10-27 13:16:02 +02:00 |
|
Christophe Latour
|
83a75f47ef
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-10-27 13:13:46 +02:00 |
|
Marion Muszynski
|
aac4da9c0a
|
Merge branch 'ticket-14436-WP' into develop
|
2017-10-27 13:12:23 +02:00 |
|
Marion Muszynski
|
df7f31db0b
|
module wp generation
|
2017-10-27 13:11:37 +02:00 |
|
Michael RICOIS
|
2b9671cfe7
|
Add mail template
|
2017-10-27 12:44:41 +02:00 |
|
Christophe Latour
|
46f02fd0cf
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-10-26 17:32:51 +02:00 |
|
Michael RICOIS
|
01a0f65cf3
|
Merge remote-tracking branch 'origin/ticket-14273-voucher' into develop
|
2017-10-26 17:25:50 +02:00 |
|
Michael RICOIS
|
4d2469f275
|
Merge remote-tracking branch 'origin/ticket-14139-delivery-poste' into develop
|
2017-10-26 17:24:09 +02:00 |
|
Michael RICOIS
|
e3c5b8a528
|
Specific with BPR (Point Relais mais Bureau De poste)
|
2017-10-26 17:14:02 +02:00 |
|
Marion Muszynski
|
58d248143b
|
Merge branch 'fix-futureCache'
|
2017-10-25 15:48:16 +02:00 |
|
Marion Muszynski
|
f64bc5ff1f
|
fix for admin
|
2017-10-25 15:48:01 +02:00 |
|
Marion Muszynski
|
6da677a5f3
|
Merge branch 'fix-futureCache'
|
2017-10-25 15:37:28 +02:00 |
|
Marion Muszynski
|
d62919e240
|
uncache future sale
|
2017-10-25 15:37:15 +02:00 |
|
Marion Muszynski
|
0674d7d978
|
Merge branch 'app-addImgListOff'
|
2017-10-25 15:06:59 +02:00 |
|
Marion Muszynski
|
35e786058c
|
add mobile off img
|
2017-10-25 15:06:50 +02:00 |
|
Christophe Latour
|
4ae1d73d3a
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-10-25 14:56:07 +02:00 |
|
Marion Muszynski
|
9562aa2e68
|
Merge branch 'ticket-12868-WhiteBG' into develop
|
2017-10-25 14:55:46 +02:00 |
|
Marion Muszynski
|
6b297128bb
|
change payment img
|
2017-10-25 14:55:29 +02:00 |
|
Marion Muszynski
|
96a0f240f2
|
Merge branch 'add-CacheRedis'
|
2017-10-25 14:31:25 +02:00 |
|
Marion Muszynski
|
5536b0c340
|
add predis folder into tools
|
2017-10-25 13:53:42 +02:00 |
|
Marion Muszynski
|
54977daec7
|
Merge branch 'fix-namePromoBanner'
|
2017-10-24 18:35:21 +02:00 |
|
Christophe Latour
|
847747ff93
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-10-24 18:30:41 +02:00 |
|
Marion Muszynski
|
2ea53f44ab
|
Merge branch 'fix-namePromoBanner' into develop
|
2017-10-24 18:30:31 +02:00 |
|
Marion Muszynski
|
61a00eafbd
|
fix in tpl
|
2017-10-24 18:30:20 +02:00 |
|
Christophe Latour
|
9481dc5e08
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-10-24 18:27:10 +02:00 |
|
Marion Muszynski
|
53b8a9d4ee
|
fix conflict
|
2017-10-24 18:26:36 +02:00 |
|
Marion Muszynski
|
20ab1d75d9
|
change to update img promo banner
|
2017-10-24 18:24:17 +02:00 |
|
Marion Muszynski
|
f5f865dc54
|
Merge branch 'fix-dropcsv'
|
2017-10-24 16:44:19 +02:00 |
|
Marion Muszynski
|
85bb191d49
|
fix
|
2017-10-24 16:44:04 +02:00 |
|
Marion Muszynski
|
203ebfdcfd
|
Merge branch 'mv-autoload_api'
|
2017-10-24 16:33:30 +02:00 |
|
Marion Muszynski
|
d11248dcc8
|
add autoload in config
|
2017-10-24 16:33:22 +02:00 |
|
Marion Muszynski
|
dd66b3adc2
|
Merge branch 'mv-autoload_api'
|
2017-10-24 16:32:27 +02:00 |
|
Marion Muszynski
|
f61e9885be
|
move autoload api
|
2017-10-24 16:32:08 +02:00 |
|
Marion Muszynski
|
51b35e6ed9
|
Merge branch 'feature/api_bbb' into 'master'
autoload for bbb api
See merge request !4
|
2017-10-24 15:53:17 +02:00 |
|
Christophe LATOUR
|
66f30edbc6
|
autoload for bbb api
|
2017-10-24 14:59:52 +02:00 |
|
Marion Muszynski
|
437943bce7
|
Merge branch 'ticket-14260-FixCronTraceMr'
|
2017-10-24 11:03:48 +02:00 |
|
Marion Muszynski
|
824b68b169
|
fix cron trace for order state changement
|
2017-10-24 11:03:33 +02:00 |
|
Marion Muszynski
|
40259c29da
|
Merge branch 'fix-resetpassword-include'
|
2017-10-24 10:29:23 +02:00 |
|
Christophe Latour
|
c9eefa27d2
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-10-24 10:28:15 +02:00 |
|