Marion Muszynski
|
5da6bd1c3f
|
Merge branch 'tiket-productTemplate' into develop
|
2016-04-29 16:04:45 +02:00 |
|
Marion Muszynski
|
f4597e397e
|
modif flag expe in product tpl
|
2016-04-29 16:04:17 +02:00 |
|
Marion Muszynski
|
edfbde5fd3
|
Merge branch 'ticket-newExtract' into develop
|
2016-04-27 18:05:37 +02:00 |
|
Marion Muszynski
|
397a73d037
|
modif product price for DEB exp
|
2016-04-27 18:04:42 +02:00 |
|
Marion Muszynski
|
fd7e18fc32
|
Merge branch 'tiket-productTemplate' into develop
|
2016-04-27 16:35:32 +02:00 |
|
Marion Muszynski
|
9f104f2c8f
|
modif tpl product
|
2016-04-27 16:35:02 +02:00 |
|
Marion Muszynski
|
baee8d8c10
|
Merge branch 'ticket-fidelite' into develop
|
2016-04-27 16:25:03 +02:00 |
|
Marion Muszynski
|
73a43c2042
|
modif tpl product
|
2016-04-27 16:24:35 +02:00 |
|
Marion Muszynski
|
95b51d3389
|
fix conflict css
|
2016-04-27 16:13:54 +02:00 |
|
Marion Muszynski
|
2a160422d9
|
adding desc more for product
|
2016-04-27 16:11:19 +02:00 |
|
Marion Muszynski
|
73fb48d7b4
|
Merge branch 'ticket-newExtract' into develop
|
2016-04-27 12:08:45 +02:00 |
|
Marion Muszynski
|
9e2c4c5c39
|
adding origin product to DEB exp
|
2016-04-27 12:08:22 +02:00 |
|
Marion Muszynski
|
f19e86331a
|
Merge branch 'ticket-newExtract' into develop
|
2016-04-27 11:12:00 +02:00 |
|
Marion Muszynski
|
5f96303fe9
|
modif for multi generation of csv in same time
|
2016-04-27 11:11:23 +02:00 |
|
Marion Muszynski
|
b3e4aa78ab
|
Merge branch 'tiket-productTemplate' into develop
|
2016-04-26 17:06:40 +02:00 |
|
Marion Muszynski
|
20beed5ed7
|
modif css
|
2016-04-26 17:06:16 +02:00 |
|
Marion Muszynski
|
3a5edf328a
|
Merge branch 'tiket-productTemplate' into develop
|
2016-04-26 17:02:11 +02:00 |
|
Marion Muszynski
|
2217bf5414
|
modif tpl
|
2016-04-26 17:01:44 +02:00 |
|
Marion Muszynski
|
b294276498
|
Merge branch 'tiket-productTemplate' into develop
|
2016-04-26 16:52:26 +02:00 |
|
Marion Muszynski
|
e85ce5fb93
|
modif next for thumb
|
2016-04-26 16:52:04 +02:00 |
|
Marion Muszynski
|
3aa40ff214
|
Merge branch 'tiket-productTemplate' into develop
|
2016-04-26 16:43:52 +02:00 |
|
Marion Muszynski
|
82a536aa5f
|
modif tpl
|
2016-04-26 16:43:28 +02:00 |
|
Marion Muszynski
|
02fe6acca8
|
Merge branch 'tiket-productTemplate' into develop
|
2016-04-26 16:39:22 +02:00 |
|
Marion Muszynski
|
5b40878629
|
modif tpl
|
2016-04-26 16:39:06 +02:00 |
|
Marion Muszynski
|
21f418dd84
|
fix confict css
|
2016-04-26 16:22:26 +02:00 |
|
Marion Muszynski
|
cbf6deeb91
|
begin new product tpl
|
2016-04-26 16:19:40 +02:00 |
|
Marion Muszynski
|
f72b207fc0
|
Merge branch 'ticket-newExtract' into develop
|
2016-04-25 17:17:05 +02:00 |
|
Marion Muszynski
|
54bbfd5248
|
modif extract
|
2016-04-25 17:16:29 +02:00 |
|
Marion Muszynski
|
dde198080d
|
modif extract custom
|
2016-04-25 16:50:51 +02:00 |
|
Marion Muszynski
|
423b9fbcc0
|
Merge branch 'ticket-fidelite' into develop
|
2016-04-25 16:05:33 +02:00 |
|
Marion Muszynski
|
c4052dc0f0
|
modif css mobile
|
2016-04-25 16:04:51 +02:00 |
|
Marion Muszynski
|
6926224b43
|
Merge branch 'ticket-fidelite' into develop
|
2016-04-25 12:45:37 +02:00 |
|
Marion Muszynski
|
be4026ba1a
|
modif tpl
|
2016-04-25 12:45:13 +02:00 |
|
Marion Muszynski
|
99316efe95
|
Merge branch 'ticket-fidelite' into develop
|
2016-04-25 11:34:06 +02:00 |
|
Marion Muszynski
|
48ba0424d8
|
other modif
|
2016-04-25 11:31:26 +02:00 |
|
Marion Muszynski
|
7084a1055b
|
Merge branch 'ticket-fidelite' into develop
|
2016-04-25 11:14:07 +02:00 |
|
Marion Muszynski
|
957c7f1db6
|
modif hookOrderReturn
|
2016-04-25 11:13:36 +02:00 |
|
Marion Muszynski
|
e8f0026211
|
Merge branch 'ticket-updBraderie'
|
2016-04-25 10:48:17 +02:00 |
|
Marion Muszynski
|
b7dbcbd3b0
|
Merge branch 'ticket-updBraderie' into develop
|
2016-04-25 10:44:39 +02:00 |
|
Marion Muszynski
|
72a3792897
|
fix bug double adding
|
2016-04-25 10:43:24 +02:00 |
|
Marion Muszynski
|
1091ccea77
|
Merge branch 'ticket-fidelite' into develop
|
2016-04-22 18:01:02 +02:00 |
|
Marion Muszynski
|
4397a50151
|
correction concernant le return et cancel product
|
2016-04-22 18:00:36 +02:00 |
|
Marion Muszynski
|
2ef9fbd9ce
|
Merge branch 'ticket-fidelite' into develop
|
2016-04-22 17:01:40 +02:00 |
|
Marion Muszynski
|
b7ff14c0a7
|
correction for return
|
2016-04-22 17:00:45 +02:00 |
|
Marion Muszynski
|
82882a9b5b
|
Merge branch 'ticket-fidelite' into develop
|
2016-04-22 16:43:35 +02:00 |
|
Marion Muszynski
|
364fe5e367
|
corrections
|
2016-04-22 16:43:07 +02:00 |
|
Marion Muszynski
|
bd74ed03d7
|
Merge branch 'ticket-fidelite' into develop
|
2016-04-22 16:31:11 +02:00 |
|
Marion Muszynski
|
cd742921f3
|
update tpl
|
2016-04-22 16:30:18 +02:00 |
|
Marion Muszynski
|
bb15d1e81b
|
Merge branch 'ticket-fidelite' into develop
|
2016-04-22 16:21:48 +02:00 |
|
Marion Muszynski
|
3d1fb8a10a
|
other update
|
2016-04-22 16:20:53 +02:00 |
|