Marion Muszynski
|
9954f14c25
|
modif test
|
2016-07-05 16:57:30 +02:00 |
|
Marion Muszynski
|
76db559d5d
|
modif
|
2016-07-05 16:39:25 +02:00 |
|
Marion Muszynski
|
23c48db97a
|
modif
|
2016-07-05 16:31:37 +02:00 |
|
Marion Muszynski
|
93b819a577
|
test with CB trace
|
2016-07-05 16:07:39 +02:00 |
|
Marion Muszynski
|
b4949f8792
|
test
|
2016-07-05 15:41:14 +02:00 |
|
Marion Muszynski
|
75e3ab7177
|
adding return params
|
2016-07-05 15:30:42 +02:00 |
|
Marion Muszynski
|
cc0b9ce4a3
|
Merge branch 'ticket-10363'
|
2016-07-05 15:15:01 +02:00 |
|
Marion Muszynski
|
e79421073d
|
adding pending orders to stock report
|
2016-07-05 15:11:33 +02:00 |
|
Marion Muszynski
|
45bf5e67b9
|
Merge branch 'adding-log-bo'
|
2016-07-04 17:43:25 +02:00 |
|
Marion Muszynski
|
4de026d0db
|
add id_employee
|
2016-07-04 17:42:02 +02:00 |
|
Marion Muszynski
|
2d5f691dcf
|
Merge branch 'adding-log-bo'
|
2016-07-04 17:36:29 +02:00 |
|
Marion Muszynski
|
8dbbf309bf
|
fix
|
2016-07-04 17:33:56 +02:00 |
|
Marion Muszynski
|
276cc9a2b6
|
sending email when order delivery address is modified in BO
|
2016-07-04 17:30:04 +02:00 |
|
Marion Muszynski
|
3be779d03b
|
Merge branch 'ticket-simplemulti_logistic'
|
2016-07-04 16:58:23 +02:00 |
|
Marion Muszynski
|
ff715abd60
|
Merge branch 'modif-css'
|
2016-07-01 16:44:13 +02:00 |
|
Marion Muszynski
|
47335062aa
|
Merge branch 'ticket-ecotax'
|
2016-07-01 12:27:13 +02:00 |
|
Marion Muszynski
|
6a87ea0460
|
modif add button
|
2016-07-01 11:29:00 +02:00 |
|
Marion Muszynski
|
e40768c734
|
modif img reduction on product list
|
2016-07-01 11:18:52 +02:00 |
|
Marion Muszynski
|
50698ab701
|
Merge branch 'ticket-6355'
|
2016-06-30 13:06:37 +02:00 |
|
Srv Bebeboutik
|
c48e673922
|
fix prod
|
2016-06-30 11:31:11 +02:00 |
|
Marion Muszynski
|
699a06db48
|
fix conflict
|
2016-06-30 11:15:14 +02:00 |
|
Marion Muszynski
|
f99cacd293
|
small update for mobile site
|
2016-06-30 10:47:46 +02:00 |
|
Marion Muszynski
|
760bd50c06
|
adding sentence according delivery delay
|
2016-06-29 15:52:03 +02:00 |
|
Marion Muszynski
|
20896d3bbf
|
adding popup error for mobile
|
2016-06-29 09:59:03 +02:00 |
|
Marion Muszynski
|
afebcee8af
|
Merge branch 'ticket-blockbestsellerProduct'
|
2016-06-28 16:17:23 +02:00 |
|
Marion Muszynski
|
e6585427ee
|
fix
|
2016-06-28 16:15:41 +02:00 |
|
Marion Muszynski
|
10ad346ad5
|
modif idcombination
|
2016-06-28 16:07:29 +02:00 |
|
Marion Muszynski
|
dd9831daa5
|
Merge branch 'ticket-blockbestsellerProduct'
|
2016-06-28 15:55:39 +02:00 |
|
Marion Muszynski
|
f8af1f0a71
|
modif tpl trad
|
2016-06-28 15:19:31 +02:00 |
|
Marion Muszynski
|
163cc3ac04
|
adding html bind
|
2016-06-28 15:03:07 +02:00 |
|
Marion Muszynski
|
8a0b80e15e
|
pop error cart
|
2016-06-28 14:45:48 +02:00 |
|
Marion Muszynski
|
ced379c219
|
ecotax sentence
|
2016-06-24 14:34:15 +02:00 |
|
Marion Muszynski
|
43646dd4bd
|
modif
|
2016-06-24 13:54:50 +02:00 |
|
Marion Muszynski
|
985bf52e83
|
update to add product with attribute to cart from bestsellers
|
2016-06-24 12:41:46 +02:00 |
|
Srv Bebeboutik
|
3b72e67b19
|
fix from prod
|
2016-06-24 10:09:27 +02:00 |
|
Marion Muszynski
|
7b74de5aac
|
Merge branch 'ticket-tplProduct2'
|
2016-06-23 10:16:29 +02:00 |
|
Marion Muszynski
|
03dd90bec5
|
update product tpl css
|
2016-06-23 10:16:07 +02:00 |
|
Marion Muszynski
|
a9d9613b37
|
Merge branch 'ticket-tplproduct'
|
2016-06-22 16:12:32 +02:00 |
|
Marion Muszynski
|
3e65d4ed6d
|
fix css
|
2016-06-22 15:50:00 +02:00 |
|
Marion Muszynski
|
77b9c22014
|
fix conflicts
|
2016-06-22 15:03:36 +02:00 |
|
Marion Muszynski
|
f5cb833c6e
|
put description more over description short
|
2016-06-22 12:53:17 +02:00 |
|
Marion Muszynski
|
ae50025d14
|
continuing updating
|
2016-06-22 11:26:51 +02:00 |
|
Marion Muszynski
|
8ebec9fb3e
|
addind admin pending orders
|
2016-06-21 17:18:24 +02:00 |
|
Marion Muszynski
|
c442173cb8
|
add nex adminTab
|
2016-06-20 18:27:54 +02:00 |
|
Marion Muszynski
|
c29d8725ac
|
add status modify button
|
2016-06-20 15:32:06 +02:00 |
|
Marion Muszynski
|
9ddab586a1
|
Merge branch 'ticket-10254'
|
2016-06-20 15:14:50 +02:00 |
|
Marion Muszynski
|
a11f4ad97e
|
modif button color
|
2016-06-20 15:13:18 +02:00 |
|
Marion Muszynski
|
6265c1b2af
|
begin update adminlogistic
|
2016-06-20 15:09:13 +02:00 |
|
Srv Bebeboutik
|
e7e7f8381c
|
push prod modif carrier
|
2016-06-20 10:42:30 +02:00 |
|
Marion Muszynski
|
6c3e87c85a
|
Merge branch 'ticket-8251'
|
2016-06-10 14:53:46 +02:00 |
|