Marion Muszynski
|
284d7fc187
|
Merge branch 'ticket-14436-WP' into develop
|
2017-11-06 17:44:10 +01:00 |
|
Marion Muszynski
|
b67c3f7300
|
fixe comma
|
2017-11-06 17:44:02 +01:00 |
|
Marion Muszynski
|
7d06b3c212
|
Merge branch 'ticket-14436-WP' into develop
|
2017-11-06 17:41:16 +01:00 |
|
Marion Muszynski
|
62485e0888
|
fix date format
|
2017-11-06 17:41:05 +01:00 |
|
Marion Muszynski
|
7b61800173
|
Merge branch 'ticket-14436-WP' into develop
|
2017-11-06 17:37:05 +01:00 |
|
Marion Muszynski
|
d782b3e157
|
fix format and more
|
2017-11-06 17:36:53 +01:00 |
|
Marion Muszynski
|
9c4b8164e3
|
Merge branch 'ticket-14436-WP' into develop
|
2017-11-06 16:52:06 +01:00 |
|
Marion Muszynski
|
6a95069481
|
search in attributes
|
2017-11-06 16:51:48 +01:00 |
|
Michael RICOIS
|
8d24b036e5
|
Merge remote-tracking branch 'origin/ticket-14666-appli-discount' into develop
|
2017-11-06 12:26:16 +01:00 |
|
Michael RICOIS
|
7c2864d4a1
|
Fix forget check
|
2017-11-06 12:25:16 +01:00 |
|
Michael RICOIS
|
69d36c6c07
|
Merge remote-tracking branch 'origin/ticket-14666-appli-discount' into develop
|
2017-11-06 12:22:31 +01:00 |
|
Marion Muszynski
|
5a83607b98
|
Merge branch 'inte-white-fix' into develop
|
2017-11-06 12:15:01 +01:00 |
|
Marion Muszynski
|
d2614d471f
|
fix
|
2017-11-06 12:14:54 +01:00 |
|
Marion Muszynski
|
0cf41a41b1
|
Merge branch 'inte-white-fix' into develop
|
2017-11-06 12:07:27 +01:00 |
|
Marion Muszynski
|
6036bfd280
|
fix css carrier table
|
2017-11-06 12:06:14 +01:00 |
|
Michael RICOIS
|
2fb0bd187d
|
Discount only for applications
|
2017-11-06 12:00:30 +01:00 |
|
Marion Muszynski
|
a53ea90104
|
fix conflicts
|
2017-11-06 11:58:06 +01:00 |
|
Marion Muszynski
|
f31e4d5fd6
|
fix style order conf detail tpl
|
2017-11-06 11:45:20 +01:00 |
|
root
|
cd73ae71a8
|
change bg and mtn img
|
2017-11-03 16:22:44 +01:00 |
|
root
|
ca67d6026a
|
Merge branch 'master' of gitlab.antadis.net:dev-antadis/bebeboutik
|
2017-11-03 16:21:03 +01:00 |
|
root
|
90cccba602
|
fix header swift from prod
|
2017-11-03 16:20:41 +01:00 |
|
Michael RICOIS
|
6adcecc54b
|
Merge branch 'ticket-14525-parrain' into develop
|
2017-11-03 10:29:59 +01:00 |
|
Michael RICOIS
|
b2f2a0309e
|
Merge branch 'ticket-14139-delivery-poste'
|
2017-11-03 10:16:19 +01:00 |
|
Michael RICOIS
|
f6b3425af3
|
Remove notice
|
2017-10-31 17:37:49 +01:00 |
|
Michael RICOIS
|
bee38c462b
|
Add condition following number of orders
|
2017-10-31 16:45:07 +01:00 |
|
Marion Muszynski
|
4071c0d4d7
|
Merge branch 'Task-Caching_2'
|
2017-10-31 16:06:22 +01:00 |
|
Marion Muszynski
|
ead1bf052e
|
Merge branch 'Task-Caching_2' into develop
|
2017-10-31 16:04:53 +01:00 |
|
Marion Muszynski
|
d0c298f20b
|
caching menu
|
2017-10-31 16:04:36 +01:00 |
|
Michael RICOIS
|
12086ed19b
|
Merge branch 'ticket-14273-voucher' into develop
|
2017-10-31 14:59:44 +01:00 |
|
Michael RICOIS
|
eed1052304
|
Email translation
|
2017-10-31 14:58:54 +01:00 |
|
Marion Muszynski
|
b443abd67c
|
Merge branch 'ticket-White_2'
|
2017-10-31 14:49:34 +01:00 |
|
Marion Muszynski
|
a5e58e2114
|
Merge branch 'ticket-White_2' into develop
|
2017-10-31 14:48:43 +01:00 |
|
Marion Muszynski
|
bf636c7617
|
fix skinstatic
|
2017-10-31 14:48:32 +01:00 |
|
Marion Muszynski
|
1f4ce3dc25
|
Merge branch 'ticket-White_2' into develop
|
2017-10-31 14:42:37 +01:00 |
|
Marion Muszynski
|
1c4575214d
|
fix css
|
2017-10-31 14:42:23 +01:00 |
|
Marion Muszynski
|
ef54c025ad
|
Merge branch 'ticket-White_2' into develop
|
2017-10-31 13:11:14 +01:00 |
|
Marion Muszynski
|
c9e623083b
|
css
|
2017-10-31 13:10:59 +01:00 |
|
Marion Muszynski
|
0a775574f8
|
Merge branch 'ticket-14436-WP' into develop
|
2017-10-31 12:44:27 +01:00 |
|
Marion Muszynski
|
233559e439
|
fix count nex products
|
2017-10-31 12:44:11 +01:00 |
|
Marion Muszynski
|
e72bdef669
|
Merge branch 'ticket-14436-WP' into develop
|
2017-10-31 12:41:21 +01:00 |
|
Marion Muszynski
|
d8a4e94113
|
fix filename
|
2017-10-31 12:41:11 +01:00 |
|
Marion Muszynski
|
f0cc764b16
|
Merge branch 'ticket-14436-WP' into develop
|
2017-10-31 12:32:53 +01:00 |
|
Marion Muszynski
|
caf88c2c7e
|
correction of formulae
|
2017-10-31 12:32:41 +01:00 |
|
Michael RICOIS
|
7bd7624200
|
Add sponsor from backoffice
|
2017-10-31 12:24:29 +01:00 |
|
Marion Muszynski
|
2f20adc1e6
|
Merge branch 'ticket-14436-WP' into develop
|
2017-10-30 15:45:42 +01:00 |
|
Marion Muszynski
|
a6ebb26af0
|
fix when product not found
|
2017-10-30 15:45:23 +01:00 |
|
Marion Muszynski
|
c3a0bbd68d
|
Merge branch 'Task-Caching'
|
2017-10-30 15:11:31 +01:00 |
|
Marion Muszynski
|
cd2bf20ae9
|
uncache sale for backoffice
|
2017-10-30 15:11:20 +01:00 |
|
Marion Muszynski
|
ba0c4e7396
|
Merge branch 'Task-Caching'
|
2017-10-30 14:42:37 +01:00 |
|
Marion Muszynski
|
5ea49b53b4
|
Merge branch 'Task-Caching' into develop
|
2017-10-30 14:41:52 +01:00 |
|