Commit Graph

1226 Commits

Author SHA1 Message Date
Marion Muszynski
fc86cfd982 Merge branch 'fix-AideContact' 2016-11-15 11:51:43 +01:00
Marion Muszynski
4f9add049e addition redirect to all forms 2016-11-15 11:48:52 +01:00
Marion Muszynski
e52b90f790 Merge branch 'fix-AideContact' 2016-11-15 10:44:05 +01:00
Marion Muszynski
a839bafd66 addition of redirection to the good form 2016-11-15 10:43:45 +01:00
Marion Muszynski
05d15188b6 Merge branch 'fix-AideContact' 2016-11-15 10:31:48 +01:00
Marion Muszynski
684d096c48 modif css and redirection to the good form 2016-11-15 10:28:52 +01:00
Marion Muszynski
2e8468df7e Merge branch 'fix-AideContact' 2016-11-14 14:38:43 +01:00
Marion Muszynski
2645434803 openning to customers 2016-11-14 14:38:23 +01:00
Marion Muszynski
af0f6ca700 Merge branch 'fix-AideContact' 2016-11-14 14:22:22 +01:00
Marion Muszynski
a5629eb2c7 adjusting mobile version 2016-11-14 14:19:28 +01:00
Marion Muszynski
708f800f48 Merge branch 'fix-AideContact' 2016-11-14 10:58:47 +01:00
Marion Muszynski
492740d02d fix the name of forms 2016-11-14 10:58:28 +01:00
Marion Muszynski
7cee5d97c4 Merge branch 'ticket-11557-FixLinkSaleCategory' 2016-11-10 16:26:13 +01:00
Marion Muszynski
a13a8813ea comment sending mail 2016-11-10 16:25:56 +01:00
Marion Muszynski
e34bef4bd2 small fix 2016-11-10 16:09:09 +01:00
Marion Muszynski
e7413fd51e add of multi delete option 2016-11-10 13:21:20 +01:00
Marion Muszynski
2daa5010f6 Merge branch 'ticket-11621-fixLogoMobile' 2016-11-10 12:31:18 +01:00
Marion Muszynski
04b5314a96 change logo width on mobile version 2016-11-10 12:30:51 +01:00
Marion Muszynski
ca38824e83 restriction on liston and listoff 2016-11-10 10:36:14 +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
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
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
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
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
57c1043e3a small fix 2016-11-07 15:43:36 +01:00
Marion Muszynski
962fac493e fixin product tpl 2016-11-07 15:41:52 +01:00
Marion Muszynski
54427ea473 new delay added in choice in ps management 2016-11-07 15:35:15 +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
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
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