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
|
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 |
|
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 |
|
Marion Muszynski
|
c25d0551cd
|
remove console log
|
2017-10-30 14:41:37 +01:00 |
|
Marion Muszynski
|
0b78ebc2f3
|
Merge branch 'Task-Caching' into develop
|
2017-10-30 13:42:08 +01:00 |
|
Marion Muszynski
|
07dd8ab9c9
|
test flush cache sale
|
2017-10-30 13:41:50 +01:00 |
|
Marion Muszynski
|
6f3b5615dc
|
Merge branch 'ticket-12868-WhiteBG'
|
2017-10-30 11:35:14 +01:00 |
|
root
|
690a60f4ad
|
fix from prod for payment modules
|
2017-10-30 11:34:13 +01:00 |
|
Marion Muszynski
|
b7830f009e
|
Merge branch 'ticket-14309-fixAlreadyPaid' into develop
|
2017-10-30 10:27:59 +01:00 |
|
Marion Muszynski
|
356a2ab034
|
test if cart is already transformed
|
2017-10-30 10:27:20 +01:00 |
|
Marion Muszynski
|
1585057079
|
Merge branch 'fix-pdf'
|
2017-10-27 16:30:33 +02:00 |
|
Marion Muszynski
|
b20b9ede8f
|
fix offset i
|
2017-10-27 16:30:17 +02:00 |
|
Christophe Latour
|
856e6d6665
|
merging master
|
2017-10-27 16:19:40 +02:00 |
|
Marion Muszynski
|
986645f92a
|
Merge branch 'fix-forApp'
|
2017-10-27 16:19:39 +02:00 |
|
Marion Muszynski
|
0f810abd18
|
fix fraud paybox when i is empty
|
2017-10-27 16:19:20 +02:00 |
|
Marion Muszynski
|
2ea2904374
|
Merge branch 'fix-forApp'
|
2017-10-27 16:16:09 +02:00 |
|
Marion Muszynski
|
8bcf9fe456
|
fix swift header preg_replace
|
2017-10-27 16:15:54 +02:00 |
|
Marion Muszynski
|
4d10fd421e
|
Merge branch 'fix-pdf'
|
2017-10-27 16:02:03 +02:00 |
|
Marion Muszynski
|
b25b946e8d
|
fix when i++ not set
|
2017-10-27 16:01:48 +02:00 |
|
Christophe Latour
|
8c2c35dbde
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-10-27 15:48:16 +02:00 |
|
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 |
|