Marion Muszynski
|
be66a5cb5a
|
Merge branch 'ticket-10133' into develop
|
2016-09-15 12:07:24 +02:00 |
|
Marion Muszynski
|
6304de6703
|
fix of unknown function
|
2016-09-15 12:07:03 +02:00 |
|
Marion Muszynski
|
445227062e
|
Merge branch 'ticket-10133' into develop
|
2016-09-15 11:42:52 +02:00 |
|
Marion Muszynski
|
72b189c33d
|
addition of lapostews package checking
|
2016-09-15 11:42:21 +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
|
1128f0583c
|
Merge branch 'ticket-10133' into develop
|
2016-09-15 10:25:14 +02:00 |
|
Marion Muszynski
|
ac2de48ccc
|
case when it s already in partial and we cancel the last product to send
|
2016-09-15 10:24:53 +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 |
|
Marion Muszynski
|
fa7a20ab2e
|
fix price 3
|
2016-09-14 15:26:12 +02:00 |
|
Marion Muszynski
|
3ed6c2c33f
|
Merge branch 'ticket-payboxAgreement' into develop
|
2016-09-14 15:16:23 +02:00 |
|
Marion Muszynski
|
9ef597817e
|
fix price 2
|
2016-09-14 15:16:07 +02:00 |
|
Marion Muszynski
|
c143af67b3
|
Merge branch 'ticket-payboxAgreement' into develop
|
2016-09-14 15:12:22 +02:00 |
|
Marion Muszynski
|
ccd8ce68cb
|
fix price
|
2016-09-14 15:12:05 +02:00 |
|
Marion Muszynski
|
65827b9696
|
Merge branch 'possible-xss-attach'
|
2016-09-14 12:51:29 +02:00 |
|
Marion Muszynski
|
5edb7a4558
|
Merge branch 'possible-xss-attach' into develop
|
2016-09-14 12:43:07 +02:00 |
|
Marion Muszynski
|
fed2f9d357
|
Fixed a possible XSS attack flaw
|
2016-09-14 12:37:07 +02:00 |
|
Marion Muszynski
|
18708e534f
|
Merge branch 'fix-loyalty'
|
2016-09-14 12:26:19 +02:00 |
|
Marion Muszynski
|
995e23ccd0
|
Merge branch 'fix-loyalty' into develop
|
2016-09-14 12:22:23 +02:00 |
|
Marion Muszynski
|
22c1cd62b3
|
addition of message
|
2016-09-14 12:22:00 +02:00 |
|
Marion Muszynski
|
813fb43ea3
|
Merge branch 'fix-loyalty' into develop
|
2016-09-14 12:17:41 +02:00 |
|
Marion Muszynski
|
91af2d4455
|
addition of manual updating of loyalty orders
|
2016-09-14 12:17:23 +02:00 |
|
Marion Muszynski
|
a570a649f0
|
Merge branch 'ticket-10883'
|
2016-09-14 11:05:56 +02:00 |
|
Marion Muszynski
|
3e16557de0
|
Merge branch 'ticket-10883' into develop
|
2016-09-14 11:04:01 +02:00 |
|
Marion Muszynski
|
cf3b0cca11
|
addition of category thumb checking
|
2016-09-14 11:03:36 +02:00 |
|
Marion Muszynski
|
b6a69ec6a3
|
modif current state when product is refund on partial sent order
|
2016-09-12 17:08:25 +02:00 |
|
Marion Muszynski
|
aaee95029a
|
Merge branch 'fix-css'
|
2016-09-12 15:42:13 +02:00 |
|
Marion Muszynski
|
e05ee41c73
|
Merge branch 'fix-css' into develop
|
2016-09-12 15:40:41 +02:00 |
|
Marion Muszynski
|
4581e8d20e
|
fix width of ps description
|
2016-09-12 15:40:23 +02:00 |
|
Marion Muszynski
|
649ff79d13
|
Merge branch 'evo-savePaypal' into develop
|
2016-09-09 17:19:45 +02:00 |
|
Marion Muszynski
|
1e7243c023
|
checking orders addition
|
2016-09-09 17:19:12 +02:00 |
|
Marion Muszynski
|
eb5495cf15
|
Merge branch 'ticket-payboxAgreement' into develop
|
2016-09-09 14:37:52 +02:00 |
|
Marion Muszynski
|
fca308f3ae
|
modif css
|
2016-09-09 14:37:32 +02:00 |
|
Marion Muszynski
|
9e8c06d808
|
Merge branch 'ticket-payboxAgreement' into develop
|
2016-09-09 13:14:15 +02:00 |
|
Marion Muszynski
|
1b444a773f
|
css modif
|
2016-09-09 13:13:57 +02:00 |
|
Marion Muszynski
|
410ddb43b1
|
Merge branch 'ticket-payboxAgreement' into develop
|
2016-09-09 13:10:00 +02:00 |
|
Marion Muszynski
|
3d325dbc7c
|
small modif
|
2016-09-09 13:09:43 +02:00 |
|
Marion Muszynski
|
3c7e15e2c3
|
Merge branch 'ticket-payboxAgreement' into develop
|
2016-09-09 13:07:18 +02:00 |
|