Marion Muszynski
|
3ecf54cfcc
|
fix conflicts
|
2016-11-24 16:05:44 +01:00 |
|
Marion Muszynski
|
c17fb91c63
|
addition of orders selection and css modif
|
2016-11-24 16:04:13 +01:00 |
|
Marion Muszynski
|
bf529276dd
|
Merge branch 'ticket-11211-MultiDeleteImg' into develop
|
2016-11-10 13:21:35 +01:00 |
|
Marion Muszynski
|
e7413fd51e
|
add of multi delete option
|
2016-11-10 13:21:20 +01:00 |
|
Marion Muszynski
|
c9dd7475bc
|
Merge branch 'ticket-11279-CategoryTestImport' into develop
|
2016-11-08 13:07:32 +01:00 |
|
Marion Muszynski
|
7d3c98f79f
|
addition of category checking
|
2016-11-08 13:07:15 +01:00 |
|
Marion Muszynski
|
853ae921ec
|
fix conflict
|
2016-11-07 15:30:22 +01:00 |
|
Marion Muszynski
|
45a39353ab
|
addition of shipping number in admin order
|
2016-11-03 11:27:56 +01:00 |
|
Marion Muszynski
|
b915ed8649
|
Merge branch 'ticket-AideContact-SAV' into develop
|
2016-11-02 17:04:16 +01:00 |
|
Marion Muszynski
|
5b95689b06
|
small updating
|
2016-11-02 17:03:58 +01:00 |
|
Marion Muszynski
|
f038f52798
|
Merge branch 'ticket-AideContact-SAV' into develop
|
2016-10-31 14:38:55 +01:00 |
|
Marion Muszynski
|
f90f499f00
|
css adjusting
|
2016-10-31 14:38:37 +01:00 |
|
Marion Muszynski
|
7ea5ccc290
|
Merge branch 'ticket-AideContact-SAV' into develop
|
2016-10-28 17:56:52 +02:00 |
|
Marion Muszynski
|
c6ea6b27cf
|
modif css
|
2016-10-28 17:56:37 +02:00 |
|
Marion Muszynski
|
3ae711d543
|
Merge branch 'ticket-AideContact-SAV' into develop
|
2016-10-26 15:12:02 +02:00 |
|
Marion Muszynski
|
1f7b49b9b9
|
modifications
|
2016-10-26 15:11:40 +02:00 |
|
Marion Muszynski
|
1176b6f173
|
Merge branch 'ticket-AideContact-SAV' into develop
|
2016-10-25 12:24:16 +02:00 |
|
Marion Muszynski
|
938fa45de0
|
css
|
2016-10-25 12:23:57 +02:00 |
|
Marion Muszynski
|
880198366f
|
Merge branch 'ticket-AideContact-SAV' into develop
|
2016-10-25 12:20:33 +02:00 |
|
Marion Muszynski
|
67b3583d59
|
addition css
|
2016-10-25 12:20:15 +02:00 |
|
Marion Muszynski
|
82558bd166
|
Merge branch 'ticket-AideContact-SAV' into develop
|
2016-10-25 12:03:19 +02:00 |
|
Marion Muszynski
|
7aaf231422
|
integration product list in sav message
|
2016-10-25 12:03:06 +02:00 |
|
Marion Muszynski
|
4ad4ae47bc
|
Merge branch 'ticket-AideContact-SAV' into develop
|
2016-10-24 18:34:13 +02:00 |
|
Marion Muszynski
|
cb3e299efc
|
addition of multi product choice
|
2016-10-24 18:33:51 +02:00 |
|
Marion Muszynski
|
70ca285df7
|
Merge branch 'ticket-AideContact-SAV' into develop
|
2016-10-24 14:28:08 +02:00 |
|
Marion Muszynski
|
bfbfd14bd6
|
addition of signals about price and nb product
|
2016-10-24 14:27:50 +02:00 |
|
Marion Muszynski
|
f04d4c2b38
|
Merge branch 'ticket-AideContact-SAV' into develop
|
2016-10-19 12:51:48 +02:00 |
|
Marion Muszynski
|
a598bb04f4
|
modif css
|
2016-10-19 12:51:28 +02:00 |
|
Marion Muszynski
|
85ea947a11
|
Merge branch 'ticket-AideContact-SAV' into develop
|
2016-10-19 12:44:51 +02:00 |
|
Marion Muszynski
|
47b180afb1
|
continuation of modif
|
2016-10-19 12:44:12 +02:00 |
|
Marion Muszynski
|
3db72e00f4
|
Merge branch 'ticket-AideContact-SAV' into develop
|
2016-10-18 17:07:37 +02:00 |
|
Marion Muszynski
|
1d4435a4ef
|
continuing
|
2016-10-18 17:02:58 +02:00 |
|
Marion Muszynski
|
6c51d23463
|
Merge branch 'ticket-AideContact-SAV' into develop
|
2016-10-18 16:12:31 +02:00 |
|
Marion Muszynski
|
85650ffaba
|
fix
|
2016-10-18 16:12:13 +02:00 |
|
Marion Muszynski
|
b7b982305f
|
continuation
|
2016-10-18 15:25:52 +02:00 |
|
Marion Muszynski
|
3550b68bc5
|
add custom message
|
2016-10-18 14:43:12 +02:00 |
|
Marion Muszynski
|
b5916c5a74
|
Merge branch 'ticket-AideContact-SAV' into develop
|
2016-10-18 12:12:27 +02:00 |
|
Marion Muszynski
|
84f2643e53
|
continuation sav
|
2016-10-18 12:12:06 +02:00 |
|
Marion Muszynski
|
6e0cfd7635
|
modif
|
2016-10-17 17:29:37 +02:00 |
|
Marion Muszynski
|
27a62959a6
|
start refund sav page
|
2016-10-14 18:30:05 +02:00 |
|
Marion Muszynski
|
ead50a26c4
|
Merge branch 'ticket-AssociateProducts' into develop
|
2016-10-05 18:12:19 +02:00 |
|
Marion Muszynski
|
4a19fa9288
|
modif css accessories
|
2016-10-05 18:12:04 +02:00 |
|
Marion Muszynski
|
6e515c5207
|
Merge branch 'ticket-AssociateProducts' into develop
|
2016-10-05 17:51:08 +02:00 |
|
Marion Muszynski
|
6a415ac50f
|
modif css
|
2016-10-05 17:50:45 +02:00 |
|
Marion Muszynski
|
e1a3654411
|
Merge branch 'ticket-AssociateProducts' into develop
|
2016-10-05 16:19:10 +02:00 |
|
Marion Muszynski
|
047f419b8e
|
addition of img to recognize the product
|
2016-10-05 16:18:52 +02:00 |
|
Marion Muszynski
|
77222b5026
|
Merge branch 'ticket-AssociateProducts' into develop
|
2016-10-05 14:36:33 +02:00 |
|
Marion Muszynski
|
6475f2140c
|
modification of product autocomplete with only enabled products
|
2016-10-05 14:36:15 +02:00 |
|
Marion Muszynski
|
a33e2da7ca
|
Merge branch 'ticket-10805' into develop
|
2016-09-23 17:16:50 +02:00 |
|
Marion Muszynski
|
7ca4e6918b
|
addition has to clean function to see if there are products to clean
|
2016-09-23 17:16:26 +02:00 |
|