Commit Graph

2723 Commits

Author SHA1 Message Date
Marion Muszynski
e59142f7ce fix qty returnable for philea 2017-05-24 10:12:15 +02:00
Marion Muszynski
4e3d2c5b88 Merge branch 'ticket-13335-fixBulkupdate' 2017-05-23 11:32:19 +02:00
Marion Muszynski
36b9b16d8a fix when we want to export by date 2017-05-23 11:32:01 +02:00
Marion Muszynski
8a5aba0f36 Merge branch 'ticket-13166-ReturnProcess' into develop 2017-05-18 13:02:56 +02:00
Marion Muszynski
9625e2eb9e continuing 2017-05-18 13:02:35 +02:00
Marion Muszynski
a0d6001ec6 Merge branch 'ticket-13166-ReturnProcess' into develop 2017-05-17 17:25:04 +02:00
Marion Muszynski
ef732eb1c5 start of resend parcel part 2017-05-17 17:24:47 +02:00
Marion Muszynski
0cd37b3fe8 Merge branch 'Ticket-10648-MobileModif' 2017-05-17 16:51:18 +02:00
Marion Muszynski
a13fe6f2ad fix 2017-05-17 16:51:05 +02:00
Marion Muszynski
fd1a80a401 Merge branch 'Ticket-10648-MobileModif' 2017-05-17 16:48:24 +02:00
Marion Muszynski
ff124b514a fix bg in lp 2017-05-17 16:48:11 +02:00
Marion Muszynski
487a5c4c00 Merge branch 'Ticket-10648-MobileModif' 2017-05-17 16:39:34 +02:00
Marion Muszynski
14aa04ee1d fix length 2017-05-17 16:39:22 +02:00
Marion Muszynski
c8f5eb8273 Merge branch 'Ticket-10648-MobileModif' 2017-05-17 16:36:46 +02:00
Marion Muszynski
49137526de fix 2017-05-17 16:36:35 +02:00
Marion Muszynski
e6a948861e Merge branch 'Ticket-10648-MobileModif' 2017-05-17 16:34:42 +02:00
Marion Muszynski
db786b07ca fix name ps in home mobile 2017-05-17 16:34:26 +02:00
Marion Muszynski
9642a86c46 Merge branch 'ticket-13298-Gclid' 2017-05-17 16:05:01 +02:00
Marion Muszynski
633b163638 fix gclid in redirection 2017-05-17 16:04:42 +02:00
Marion Muszynski
d65fc1d446 Merge branch 'add-LogPaybox' 2017-05-17 11:40:52 +02:00
Marion Muszynski
96cb372568 Merge branch 'add-LogPaybox' into develop 2017-05-17 11:33:01 +02:00
Marion Muszynski
57fc9bff52 add log to follow direct payments 2017-05-17 11:32:39 +02:00
Marion Muszynski
29db612b5b Merge branch 'Ticket-10648-MobileModif' 2017-05-17 10:46:39 +02:00
Marion Muszynski
6b058474c3 fix - prevent scroll on description short 2017-05-17 10:46:22 +02:00
Marion Muszynski
3bc246c084 Merge branch 'Ticket-10648-MobileModif' 2017-05-17 10:28:57 +02:00
Marion Muszynski
20bca1c110 fix mobile 2017-05-17 10:28:41 +02:00
Marion Muszynski
77bd9fdbcf Merge branch 'Ticket-10648-MobileModif' 2017-05-16 11:35:21 +02:00
Marion Muszynski
dc33a0af8c some fixes 2017-05-16 11:35:03 +02:00
Marion Muszynski
5a13f29a16 Merge branch 'ticket-13166-ReturnProcess' into develop 2017-05-15 14:44:48 +02:00
Marion Muszynski
931eea448a fix order date 2017-05-15 14:44:31 +02:00
Marion Muszynski
50e9168a7b Merge branch 'ticket-13166-ReturnProcess' into develop 2017-05-15 14:42:56 +02:00
Marion Muszynski
65c8eea146 load last conv even if it s not about the order 2017-05-15 14:42:30 +02:00
Marion Muszynski
3c258749f9 Merge branch 'ticket-13166-ReturnProcess' into develop 2017-05-15 13:57:51 +02:00
Marion Muszynski
7aa63553b4 continuing and fix 2017-05-15 13:57:37 +02:00
Marion Muszynski
66edf98c06 Merge branch 'ticket-13166-ReturnProcess' into develop 2017-05-12 15:00:32 +02:00
Marion Muszynski
214082433c fix size table 2017-05-12 15:00:20 +02:00
Marion Muszynski
c44e1eb95d Merge branch 'ticket-13166-ReturnProcess' into develop 2017-05-12 14:57:29 +02:00
Marion Muszynski
ddd066a662 continuing with refund part 2017-05-12 14:57:13 +02:00
root
c5a3c5af91 fix from prod on a cron 2017-05-12 12:18:24 +02:00
Marion Muszynski
00428e330d Merge branch 'ticket-13248-ZeroQuantity' 2017-05-12 12:05:21 +02:00
Marion Muszynski
eb150cc17d Merge branch 'ticket-13248-ZeroQuantity' into develop 2017-05-12 12:04:44 +02:00
Marion Muszynski
e46f547c53 fix cron_discount and add cron to reorder braderi 2017-05-12 12:04:28 +02:00
Marion Muszynski
9180ded3e1 continuing refunding part 2017-05-12 11:12:07 +02:00
Marion Muszynski
66797776a2 Merge branch 'ticket-13166-ReturnProcess' into develop 2017-05-11 17:43:39 +02:00
Marion Muszynski
5ff5c296f5 contuning 2017-05-11 17:43:23 +02:00
Marion Muszynski
13f963acaa Merge branch 'ticket-13166-ReturnProcess' into develop 2017-05-11 15:48:58 +02:00
Marion Muszynski
ae78a0b870 continuing 2017-05-11 15:48:43 +02:00
Marion Muszynski
f30ce559c9 Merge branch 'ticket-13166-ReturnProcess' into develop 2017-05-11 12:54:29 +02:00
Marion Muszynski
825cd9f8b1 fix search by order 2017-05-11 12:54:15 +02:00
Marion Muszynski
066f650eb3 Merge branch 'ticket-13166-ReturnProcess' into develop 2017-05-11 12:36:28 +02:00