Marion Muszynski
|
6ff5ea4d4d
|
Merge branch 'ticket-payboxAgreement' into develop
|
2016-09-08 16:32:57 +02:00 |
|
Marion Muszynski
|
3ad121eedb
|
process success addition
|
2016-09-08 16:32:14 +02:00 |
|
Marion Muszynski
|
3d3adaa160
|
Merge branch 'ticket-payboxAgreement' into develop
|
2016-09-08 14:51:23 +02:00 |
|
Marion Muszynski
|
564c008cf6
|
more mailing addition
|
2016-09-08 14:51:03 +02:00 |
|
Marion Muszynski
|
5386bfe970
|
Merge branch 'ticket-payboxAgreement' into develop
|
2016-09-08 14:37:05 +02:00 |
|
Marion Muszynski
|
251b0eac53
|
addition of mailing for test
|
2016-09-08 14:36:31 +02:00 |
|
Marion Muszynski
|
847e13178e
|
Merge branch 'evo-DBorderCurrentState' into develop
|
2016-09-08 11:53:06 +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
|
c5cfa64cc2
|
Merge branch 'ticket-philea' into develop
|
2016-09-07 12:05:14 +02:00 |
|
Marion Muszynski
|
0c118717af
|
small addition
|
2016-09-07 12:03:31 +02:00 |
|
Marion Muszynski
|
72eadd62bd
|
Merge branch 'ticket-philea' into develop
|
2016-09-07 11:43:17 +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
|
40457d1935
|
Merge branch 'ticket-10296' into develop
|
2016-09-07 08:58:24 +02:00 |
|
Marion Muszynski
|
b093c60edb
|
small fix to cast id_lang
|
2016-09-07 08:57:28 +02:00 |
|
Marion Muszynski
|
a6be8282c0
|
Merge branch 'ticket-philea' into develop
|
2016-09-06 18:06:26 +02:00 |
|
Marion Muszynski
|
3caeacffae
|
modif send_article according bbb account
|
2016-09-06 18:05:54 +02:00 |
|
Marion Muszynski
|
542fe9c0b4
|
Merge branch 'ticket-philea' into develop
|
2016-09-06 16:48:57 +02:00 |
|
Marion Muszynski
|
01c77b3901
|
modif send_commande according bbb settings
|
2016-09-06 16:48:13 +02:00 |
|
Marion Muszynski
|
cff89e4704
|
Merge branch 'ticket-philea' into develop
|
2016-09-06 15:42:28 +02:00 |
|
Marion Muszynski
|
36180ad403
|
add remote address and http host in send_article
|
2016-09-06 15:41:34 +02:00 |
|
Marion Muszynski
|
1e751507ab
|
Merge branch 'ticket-philea' into develop
|
2016-09-06 15:34:55 +02:00 |
|
Marion Muszynski
|
1df6036d99
|
addition of philea module and helper class for admin
|
2016-09-06 15:32:52 +02:00 |
|
Marion Muszynski
|
7c4ee5abad
|
Merge branch 'evo-removeThumbVP' into develop
|
2016-09-06 11:08:04 +02:00 |
|
Marion Muszynski
|
b4ff3a8ee5
|
addition of remove img option in adminPrivateSalesSales
|
2016-09-06 11:07:40 +02:00 |
|
Marion Muszynski
|
2d10e1b167
|
Merge branch 'ticket-9260'
|
2016-09-05 16:52:19 +02:00 |
|
Marion Muszynski
|
797a27cea3
|
Merge branch 'ticket-9260' into develop
|
2016-09-05 16:22:59 +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
|
6f357a68ab
|
Merge branch 'ticket-9260' into develop
|
2016-09-05 11:58:03 +02:00 |
|
Marion Muszynski
|
17eda01760
|
modif for children cat
|
2016-09-05 11:57:43 +02:00 |
|
Marion Muszynski
|
13e85738e6
|
Merge branch 'ticket-9260'
|
2016-09-05 10:37:24 +02:00 |
|
Marion Muszynski
|
3389d9d3ad
|
fix conflict
|
2016-09-05 10:26:06 +02:00 |
|
Marion Muszynski
|
3d685e10b4
|
fix addition
|
2016-09-05 10:24:21 +02:00 |
|
Marion Muszynski
|
411a95e56b
|
Merge branch 'ticket-9260' into develop
|
2016-09-02 12:04:31 +02:00 |
|
Marion Muszynski
|
930b874822
|
fix for sub cat thumb
|
2016-09-02 12:04:10 +02:00 |
|
Marion Muszynski
|
84c83241a8
|
Merge branch 'fix-10796'
|
2016-09-02 11:29:50 +02:00 |
|
Marion Muszynski
|
fb0cf0f757
|
Merge branch 'fix-10796' into develop
|
2016-09-02 11:23:34 +02:00 |
|
Rodney Figaro
|
d06391d181
|
fix bug when submitting a product form with no new image added (BO)
|
2016-09-02 10:49:34 +02:00 |
|