Marion Muszynski
|
b26fefd0f3
|
fix conflict
|
2016-09-21 16:24:32 +02:00 |
|
Marion Muszynski
|
2cde4025ac
|
add loader for paybox direct payment
|
2016-09-21 16:21:32 +02:00 |
|
Marion Muszynski
|
338da7eb3f
|
Merge branch 'ticket-GAnalytics' into develop
|
2016-09-21 16:09:14 +02:00 |
|
Marion Muszynski
|
3b855c7ad9
|
ec continuation, addition of addToCart event
|
2016-09-21 16:08:54 +02:00 |
|
Marion Muszynski
|
8df4bed44a
|
continuation
|
2016-09-21 14:29:34 +02:00 |
|
Marion Muszynski
|
430cabc449
|
Merge branch 'ticket-eanUpgrade' into develop
|
2016-09-20 14:49:30 +02:00 |
|
Marion Muszynski
|
58d2b92b0c
|
continuing braderie upgrade
|
2016-09-20 14:49:02 +02:00 |
|
Marion Muszynski
|
c6d74f9f1c
|
Merge branch 'ticket-eanUpgrade' into develop
|
2016-09-20 11:03:15 +02:00 |
|
Marion Muszynski
|
ffe2e24a7a
|
reset quantity value in braderie after product was added
|
2016-09-20 11:02:50 +02:00 |
|
Marion Muszynski
|
61b198a9c1
|
Merge branch 'ticket-eanUpgrade' into develop
|
2016-09-19 18:07:21 +02:00 |
|
Marion Muszynski
|
96ba6fbaca
|
second fix
|
2016-09-19 18:07:02 +02:00 |
|
Marion Muszynski
|
b69bd11d6b
|
fix issue vi
|
2016-09-19 18:03:07 +02:00 |
|
Marion Muszynski
|
cd540ac533
|
fix attribute image
|
2016-09-19 18:01:20 +02:00 |
|
Marion Muszynski
|
443b054b7e
|
Merge branch 'ticket-eanUpgrade' into develop
|
2016-09-19 17:50:32 +02:00 |
|
Marion Muszynski
|
81769c64e7
|
addition of product image in braderie
|
2016-09-19 17:50:14 +02:00 |
|
Marion Muszynski
|
0e4e134544
|
Merge branch 'ticket-philea'
|
2016-09-19 15:40:17 +02:00 |
|
Marion Muszynski
|
fa825f9cc7
|
modif css
|
2016-09-19 15:39:50 +02:00 |
|
Marion Muszynski
|
588b23161d
|
Merge branch 'ticket-philea'
|
2016-09-19 15:34:37 +02:00 |
|
Marion Muszynski
|
415b4b0999
|
Merge branch 'ticket-philea' into develop
|
2016-09-19 15:34:13 +02:00 |
|
Marion Muszynski
|
d9b117774d
|
css fix
|
2016-09-19 15:33:43 +02:00 |
|
Marion Muszynski
|
5aac7f617b
|
Merge branch 'ticket-8048' into develop
|
2016-09-19 12:42:21 +02:00 |
|
Marion Muszynski
|
dafde1fd0f
|
Merge branch 'ticket-philea'
|
2016-09-19 11:58:48 +02:00 |
|
Marion Muszynski
|
a51cf6fb55
|
continuing to add some stuff
|
2016-09-19 11:58:14 +02:00 |
|
Marion Muszynski
|
50da985ca7
|
Merge branch 'ticket-philea'
|
2016-09-16 17:33:55 +02:00 |
|
Marion Muszynski
|
e1f82aba03
|
small fix
|
2016-09-16 17:33:23 +02:00 |
|
Marion Muszynski
|
d0b55456b9
|
Merge branch 'ticket-philea'
|
2016-09-16 17:18:04 +02:00 |
|
Marion Muszynski
|
4e42740019
|
message modification
|
2016-09-16 17:17:41 +02:00 |
|
Marion Muszynski
|
4179f1513d
|
Merge branch 'ticket-philea'
|
2016-09-16 16:36:46 +02:00 |
|
Marion Muszynski
|
56136b51ec
|
addition of report management
|
2016-09-16 16:36:16 +02:00 |
|
Marion Muszynski
|
967a9659cf
|
Merge branch 'ticket-philea'
|
2016-09-15 16:30:12 +02:00 |
|
Marion Muszynski
|
0980058b1d
|
matching ART CDC
|
2016-09-15 16:29:54 +02:00 |
|
Marion Muszynski
|
e9d46cd1a4
|
Merge branch 'ticket-10884'
|
2016-09-15 16:05:12 +02:00 |
|
Marion Muszynski
|
86f79df2c2
|
Merge branch 'ticket-10133'
|
2016-09-15 15:33:00 +02:00 |
|
Marion Muszynski
|
e77fe5a0dc
|
Merge branch 'ticket-payboxAgreement' into develop
|
2016-09-15 15:24:43 +02:00 |
|
Marion Muszynski
|
bb457294ea
|
fix mod translation
|
2016-09-15 15:24:10 +02:00 |
|
Marion Muszynski
|
4354f166be
|
Merge branch 'ticket-10884' into develop
|
2016-09-15 11:14:30 +02:00 |
|
Marion Muszynski
|
88a7ca8e96
|
fix export by date
|
2016-09-15 11:14:09 +02:00 |
|
Marion Muszynski
|
dbcbfacae3
|
Merge branch 'ticket-10133' into develop
|
2016-09-15 10:52:08 +02:00 |
|
Marion Muszynski
|
bafca862a3
|
adjusting loyalty updating
|
2016-09-15 10:51:50 +02:00 |
|
Marion Muszynski
|
4ce3478765
|
Merge branch 'ticket-10884' into develop
|
2016-09-14 17:42:25 +02:00 |
|
Marion Muszynski
|
cf18d95f8b
|
moving of sale export block to privatesale logisitique
|
2016-09-14 17:42:08 +02:00 |
|
Marion Muszynski
|
120303fa1b
|
Merge branch 'ticket-10884' into develop
|
2016-09-14 17:00:16 +02:00 |
|
Marion Muszynski
|
2e7ff69817
|
addition of date to find the good ps in bulkupdate export part
|
2016-09-14 17:00:01 +02:00 |
|
Marion Muszynski
|
66bfbed0ed
|
Merge branch 'ticket-payboxAgreement' into develop
|
2016-09-14 16:10:55 +02:00 |
|
Marion Muszynski
|
415c1ba7ad
|
text modification
|
2016-09-14 16:10:41 +02:00 |
|
Marion Muszynski
|
f5cf501cad
|
Merge branch 'ticket-payboxAgreement' into develop
|
2016-09-14 16:01:05 +02:00 |
|
Marion Muszynski
|
c8ecf874fe
|
stupid mistake
|
2016-09-14 16:00:50 +02:00 |
|
Marion Muszynski
|
e15272197d
|
Merge branch 'ticket-payboxAgreement' into develop
|
2016-09-14 15:54:43 +02:00 |
|
Marion Muszynski
|
75f702d132
|
right fix
|
2016-09-14 15:54:25 +02:00 |
|
Marion Muszynski
|
8fbc3de72e
|
Merge branch 'ticket-payboxAgreement' into develop
|
2016-09-14 15:26:28 +02:00 |
|