2401 Commits

Author SHA1 Message Date
Michael RICOIS
ccd3ebb1df Merge branch 'ticket-14666-appli-discount' 2017-11-08 10:35:44 +01:00
Michael RICOIS
d9bd62dba7 Merge branch 'ticket-14525-parrain' 2017-11-08 09:52:16 +01:00
Michael RICOIS
60e3da5380 Traduction 2017-11-07 12:33:03 +01:00
Michael RICOIS
7dfa4d7cbe Remove replacement 2017-11-07 12:17:20 +01:00
Marion Muszynski
b67c3f7300 fixe comma 2017-11-06 17:44:02 +01:00
Marion Muszynski
62485e0888 fix date format 2017-11-06 17:41:05 +01:00
Marion Muszynski
d782b3e157 fix format and more 2017-11-06 17:36:53 +01:00
Marion Muszynski
6a95069481 search in attributes 2017-11-06 16:51:48 +01:00
Michael RICOIS
7c2864d4a1 Fix forget check 2017-11-06 12:25:16 +01:00
Marion Muszynski
4e84124e85 Merge branch 'inte-white-fix' 2017-11-06 12:23:49 +01:00
Marion Muszynski
d2614d471f fix 2017-11-06 12:14:54 +01:00
Marion Muszynski
6036bfd280 fix css carrier table 2017-11-06 12:06:14 +01:00
Michael RICOIS
2fb0bd187d Discount only for applications 2017-11-06 12:00:30 +01:00
Marion Muszynski
f31e4d5fd6 fix style order conf detail tpl 2017-11-06 11:45:20 +01:00
root
cd73ae71a8 change bg and mtn img 2017-11-03 16:22:44 +01:00
root
ca67d6026a Merge branch 'master' of gitlab.antadis.net:dev-antadis/bebeboutik 2017-11-03 16:21:03 +01:00
root
90cccba602 fix header swift from prod 2017-11-03 16:20:41 +01:00
Michael RICOIS
b2f2a0309e Merge branch 'ticket-14139-delivery-poste' 2017-11-03 10:16:19 +01:00
Michael RICOIS
f6b3425af3 Remove notice 2017-10-31 17:37:49 +01:00
Michael RICOIS
bee38c462b Add condition following number of orders 2017-10-31 16:45:07 +01:00
Marion Muszynski
4071c0d4d7 Merge branch 'Task-Caching_2' 2017-10-31 16:06:22 +01:00
Marion Muszynski
d0c298f20b caching menu 2017-10-31 16:04:36 +01:00
Michael RICOIS
eed1052304 Email translation 2017-10-31 14:58:54 +01:00
Marion Muszynski
b443abd67c Merge branch 'ticket-White_2' 2017-10-31 14:49:34 +01:00
Marion Muszynski
bf636c7617 fix skinstatic 2017-10-31 14:48:32 +01:00
Marion Muszynski
1c4575214d fix css 2017-10-31 14:42:23 +01:00
Marion Muszynski
c9e623083b css 2017-10-31 13:10:59 +01:00
Marion Muszynski
233559e439 fix count nex products 2017-10-31 12:44:11 +01:00
Marion Muszynski
d8a4e94113 fix filename 2017-10-31 12:41:11 +01:00
Marion Muszynski
caf88c2c7e correction of formulae 2017-10-31 12:32:41 +01:00
Michael RICOIS
7bd7624200 Add sponsor from backoffice 2017-10-31 12:24:29 +01:00
Marion Muszynski
a6ebb26af0 fix when product not found 2017-10-30 15:45:23 +01:00
Marion Muszynski
c3a0bbd68d Merge branch 'Task-Caching' 2017-10-30 15:11:31 +01:00
Marion Muszynski
cd2bf20ae9 uncache sale for backoffice 2017-10-30 15:11:20 +01:00
Marion Muszynski
ba0c4e7396 Merge branch 'Task-Caching' 2017-10-30 14:42:37 +01:00
Marion Muszynski
c25d0551cd remove console log 2017-10-30 14:41:37 +01:00
Marion Muszynski
07dd8ab9c9 test flush cache sale 2017-10-30 13:41:50 +01:00
Marion Muszynski
6f3b5615dc Merge branch 'ticket-12868-WhiteBG' 2017-10-30 11:35:14 +01:00
root
690a60f4ad fix from prod for payment modules 2017-10-30 11:34:13 +01:00
Marion Muszynski
1585057079 Merge branch 'fix-pdf' 2017-10-27 16:30:33 +02:00
Marion Muszynski
b20b9ede8f fix offset i 2017-10-27 16:30:17 +02:00
Marion Muszynski
986645f92a Merge branch 'fix-forApp' 2017-10-27 16:19:39 +02:00
Marion Muszynski
0f810abd18 fix fraud paybox when i is empty 2017-10-27 16:19:20 +02:00
Marion Muszynski
2ea2904374 Merge branch 'fix-forApp' 2017-10-27 16:16:09 +02:00
Marion Muszynski
8bcf9fe456 fix swift header preg_replace 2017-10-27 16:15:54 +02:00
Marion Muszynski
4d10fd421e Merge branch 'fix-pdf' 2017-10-27 16:02:03 +02:00
Marion Muszynski
b25b946e8d fix when i++ not set 2017-10-27 16:01:48 +02:00
Michael RICOIS
3693455509 FR lang 2017-10-27 15:46:29 +02:00
Michael RICOIS
6b15c279b9 Date 2017-10-27 15:20:43 +02:00
Michael RICOIS
d193722c18 Change date calc 2017-10-27 14:45:36 +02:00