Marion Muszynski
|
e9d46cd1a4
|
Merge branch 'ticket-10884'
|
2016-09-15 16:05:12 +02:00 |
|
Marion Muszynski
|
de8291e281
|
Merge branch 'ticket-10133'
|
2016-09-15 15:38:10 +02:00 |
|
Marion Muszynski
|
3f2345c222
|
small fix
|
2016-09-15 15:37:44 +02:00 |
|
Marion Muszynski
|
86f79df2c2
|
Merge branch 'ticket-10133'
|
2016-09-15 15:33:00 +02:00 |
|
Marion Muszynski
|
6304de6703
|
fix of unknown function
|
2016-09-15 12:07:03 +02:00 |
|
Marion Muszynski
|
72b189c33d
|
addition of lapostews package checking
|
2016-09-15 11:42:21 +02:00 |
|
Marion Muszynski
|
88a7ca8e96
|
fix export by date
|
2016-09-15 11:14:09 +02:00 |
|
Marion Muszynski
|
bafca862a3
|
adjusting loyalty updating
|
2016-09-15 10:51:50 +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
|
cf18d95f8b
|
moving of sale export block to privatesale logisitique
|
2016-09-14 17:42:08 +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
|
65827b9696
|
Merge branch 'possible-xss-attach'
|
2016-09-14 12:51:29 +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
|
22c1cd62b3
|
addition of message
|
2016-09-14 12:22:00 +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
|
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
|
4581e8d20e
|
fix width of ps description
|
2016-09-12 15:40:23 +02:00 |
|
Marion Muszynski
|
d7e65fa383
|
Merge branch 'fix-htmlHomeVp'
|
2016-09-09 11:36:06 +02:00 |
|
Marion Muszynski
|
cb3b1de22c
|
fix to not escape html on vp description
|
2016-09-09 11:35:36 +02:00 |
|
Marion Muszynski
|
5c755acd4b
|
Merge branch 'ticket-philea'
|
2016-09-08 12:41:24 +02:00 |
|
Marion Muszynski
|
50cc5511ac
|
fix about phone number
|
2016-09-08 12:40:32 +02:00 |
|
Marion Muszynski
|
86bb7a1413
|
Merge branch 'evo-DBorderCurrentState'
|
2016-09-08 11:58:45 +02:00 |
|
Marion Muszynski
|
c63eb836ad
|
table addition to load current order state
|
2016-09-08 11:52:44 +02:00 |
|
Marion Muszynski
|
1edec769dd
|
Merge branch 'ticket-philea'
|
2016-09-07 17:42:43 +02:00 |
|
Marion Muszynski
|
d839706175
|
modif code article
|
2016-09-07 17:42:06 +02:00 |
|
Marion Muszynski
|
7c3fbc75dd
|
Merge branch 'ticket-philea'
|
2016-09-07 16:17:36 +02:00 |
|
Marion Muszynski
|
a6fc45e479
|
adjust send_commande
|
2016-09-07 16:17:03 +02:00 |
|
Marion Muszynski
|
68fe001982
|
Merge branch 'ticket-philea'
|
2016-09-07 15:11:01 +02:00 |
|
Marion Muszynski
|
df7b6dbc05
|
small fix
|
2016-09-07 15:10:28 +02:00 |
|
Marion Muszynski
|
f8da29a7e2
|
fix conflict about vi editor
|
2016-09-07 15:06:41 +02:00 |
|
Marion Muszynski
|
88b3c10898
|
fix
|
2016-09-07 15:03:58 +02:00 |
|
Marion Muszynski
|
66544cc598
|
Merge branch 'ticket-10296'
|
2016-09-07 14:45:15 +02:00 |
|
Marion Muszynski
|
b376875be8
|
modif wordwrap
|
2016-09-07 14:44:40 +02:00 |
|
Marion Muszynski
|
a7198f0fea
|
Merge branch 'ticket-philea'
|
2016-09-07 12:29:37 +02:00 |
|
Marion Muszynski
|
0c118717af
|
small addition
|
2016-09-07 12:03:31 +02:00 |
|
Marion Muszynski
|
f790336c29
|
big modif
|
2016-09-07 11:42:38 +02:00 |
|
Marion Muszynski
|
266e966b2f
|
Merge branch 'ticket-10296'
|
2016-09-07 09:03:09 +02:00 |
|
Marion Muszynski
|
b093c60edb
|
small fix to cast id_lang
|
2016-09-07 08:57:28 +02:00 |
|
Marion Muszynski
|
3caeacffae
|
modif send_article according bbb account
|
2016-09-06 18:05:54 +02:00 |
|
Marion Muszynski
|
01c77b3901
|
modif send_commande according bbb settings
|
2016-09-06 16:48:13 +02:00 |
|
Marion Muszynski
|
36180ad403
|
add remote address and http host in send_article
|
2016-09-06 15:41:34 +02:00 |
|
Marion Muszynski
|
1df6036d99
|
addition of philea module and helper class for admin
|
2016-09-06 15:32:52 +02:00 |
|
Marion Muszynski
|
2d10e1b167
|
Merge branch 'ticket-9260'
|
2016-09-05 16:52:19 +02:00 |
|
Marion Muszynski
|
50e0bc4c79
|
modification to find the right category thumb in productController
|
2016-09-05 16:22:28 +02:00 |
|
Marion Muszynski
|
b6dc54c290
|
addition html2text for emarsys and vp description
|
2016-09-05 15:45:05 +02:00 |
|
Marion Muszynski
|
17eda01760
|
modif for children cat
|
2016-09-05 11:57:43 +02:00 |
|