Marion Muszynski
|
a9c19b6c6c
|
Merge branch 'ticket-11210-imageVP' into develop
|
2016-11-09 17:50:56 +01:00 |
|
Marion Muszynski
|
9a9a222552
|
simplification of img uploaded in privatesale
|
2016-11-09 17:50:41 +01:00 |
|
Marion Muszynski
|
e71c932a21
|
Merge branch 'ticket-11557-FixLinkSaleCategory'
|
2016-11-09 11:22:11 +01:00 |
|
Marion Muszynski
|
d0f52b3070
|
Merge branch 'ticket-11557-FixLinkSaleCategory' into develop
|
2016-11-09 11:19:33 +01:00 |
|
Marion Muszynski
|
a1f1eca990
|
addition of mail sending to check bad behaviours
|
2016-11-09 11:19:05 +01:00 |
|
Marion Muszynski
|
669067bc5c
|
Merge branch 'ticket-ChangeDeliveryAddress'
|
2016-11-08 16:11:24 +01:00 |
|
Marion Muszynski
|
ad9113aed1
|
Merge branch 'ticket-ChangeDeliveryAddress' into develop
|
2016-11-08 16:10:16 +01:00 |
|
Marion Muszynski
|
ec2694f052
|
addition of country restriction
|
2016-11-08 16:09:41 +01:00 |
|
Marion Muszynski
|
57e35ba7d8
|
Merge branch 'ticket-11557-FixLinkSaleCategory'
|
2016-11-08 14:59:21 +01:00 |
|
Marion Muszynski
|
ff7bed445b
|
Merge branch 'ticket-11557-FixLinkSaleCategory' into develop
|
2016-11-08 14:58:49 +01:00 |
|
Marion Muszynski
|
e88cab6df2
|
addition of module for many config
|
2016-11-08 14:58:29 +01:00 |
|
Marion Muszynski
|
6c69b6efa7
|
Merge branch 'ticket-11279-CategoryTestImport'
|
2016-11-08 13:13: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
|
b1a35c4885
|
Merge branch 'ticket-11513-newDelay'
|
2016-11-07 15:46:13 +01:00 |
|
Marion Muszynski
|
e996d5fcf6
|
Merge branch 'ticket-11513-newDelay' into develop
|
2016-11-07 15:43:51 +01:00 |
|
Marion Muszynski
|
57c1043e3a
|
small fix
|
2016-11-07 15:43:36 +01:00 |
|
Marion Muszynski
|
9b4f712659
|
Merge branch 'ticket-11513-newDelay' into develop
|
2016-11-07 15:42:14 +01:00 |
|
Marion Muszynski
|
962fac493e
|
fixin product tpl
|
2016-11-07 15:41:52 +01:00 |
|
Marion Muszynski
|
b4eaebddcf
|
fix vi bugs
|
2016-11-07 15:35:57 +01:00 |
|
Marion Muszynski
|
54427ea473
|
new delay added in choice in ps management
|
2016-11-07 15:35:15 +01:00 |
|
Marion Muszynski
|
853ae921ec
|
fix conflict
|
2016-11-07 15:30:22 +01:00 |
|
Marion Muszynski
|
ef7467f787
|
addition of a new delay for xmas
|
2016-11-07 15:28:43 +01:00 |
|
Marion Muszynski
|
10c666cc1b
|
Merge branch 'ticket-ChangeDeliveryAddress'
|
2016-11-07 10:59:02 +01:00 |
|
Marion Muszynski
|
e4f6d284a1
|
Merge branch 'ticket-AideContact-SAV' into develop
|
2016-11-04 15:02:04 +01:00 |
|
Marion Muszynski
|
4add8caca1
|
modif
|
2016-11-04 15:01:46 +01:00 |
|
Marion Muszynski
|
938d7ead76
|
Merge branch 'ticket-AideContact-SAV' into develop
|
2016-11-04 14:56:51 +01:00 |
|
Marion Muszynski
|
ed05b99b65
|
bug fixes
|
2016-11-04 14:56:33 +01:00 |
|
Marion Muszynski
|
c8c40f93dd
|
Merge branch 'ticket-AideContact-SAV'
|
2016-11-04 13:08:16 +01:00 |
|
Marion Muszynski
|
537eb9f490
|
other fix
|
2016-11-04 13:08:00 +01:00 |
|
Marion Muszynski
|
8836f67ef6
|
Merge branch 'ticket-AideContact-SAV'
|
2016-11-04 13:05:40 +01:00 |
|
Marion Muszynski
|
576e99292e
|
good fix this time
|
2016-11-04 13:05:25 +01:00 |
|
Marion Muszynski
|
9ec6071f71
|
Merge branch 'ticket-AideContact-SAV'
|
2016-11-04 13:03:46 +01:00 |
|
Marion Muszynski
|
21b2da29d6
|
fix for front
|
2016-11-04 13:03:15 +01:00 |
|
Marion Muszynski
|
2d7ce553b1
|
Merge branch 'ticket-AideContact-SAV'
|
2016-11-04 12:55:18 +01:00 |
|
Marion Muszynski
|
306111c390
|
addition of address changement
|
2016-11-04 12:54:57 +01:00 |
|
Marion Muszynski
|
985eab5cb7
|
Merge branch 'ticket-AideContact-SAV' into develop
|
2016-11-04 12:50:55 +01:00 |
|
Marion Muszynski
|
84ab26a49b
|
fix and addition of address modification
|
2016-11-04 12:50:34 +01:00 |
|
Marion Muszynski
|
2c9d14a627
|
Merge branch 'ticket-philea3'
|
2016-11-04 10:24:17 +01:00 |
|
Marion Muszynski
|
04a004954c
|
addition of checking if product sale cache cron is processing
|
2016-11-04 10:24:04 +01:00 |
|
Marion Muszynski
|
03f8ea2f07
|
Merge branch 'ticket-philea3'
|
2016-11-03 17:20:25 +01:00 |
|
Marion Muszynski
|
5686b5395c
|
bug fixes
|
2016-11-03 17:20:09 +01:00 |
|
Marion Muszynski
|
056bcaa62f
|
Merge branch 'ticket-philea3'
|
2016-11-03 12:00:02 +01:00 |
|
Marion Muszynski
|
ea9b87ee1c
|
Merge branch 'master' of gitlab.antadis.net:dev-antadis/bebeboutik into ticket-philea3
|
2016-11-03 11:58:32 +01:00 |
|
Marion Muszynski
|
830246cb5d
|
allowing of cron sync auto
|
2016-11-03 11:58:23 +01:00 |
|
Marion Muszynski
|
6ca9aad5fc
|
Merge branch 'ticket-philea3'
|
2016-11-03 11:28:18 +01:00 |
|
Marion Muszynski
|
45a39353ab
|
addition of shipping number in admin order
|
2016-11-03 11:27:56 +01:00 |
|
Marion Muszynski
|
876f49d15b
|
Merge branch 'ticket-philea3'
|
2016-11-03 10:29:16 +01:00 |
|
Marion Muszynski
|
b744f47d4d
|
fixes
|
2016-11-03 10:28:57 +01:00 |
|
Marion Muszynski
|
2cd37d6012
|
Merge branch 'ticket-philea3'
|
2016-11-02 17:41:19 +01:00 |
|