Marion Muszynski
|
0afcb1d071
|
Merge branch 'ticket-saveCB' into develop
|
2016-07-05 15:41:36 +02:00 |
|
Marion Muszynski
|
b4949f8792
|
test
|
2016-07-05 15:41:14 +02:00 |
|
Marion Muszynski
|
f0ed6152a2
|
Merge branch 'ticket-saveCB' into develop
|
2016-07-05 15:31:03 +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
|
7c11020cdd
|
Merge branch 'ticket-10363' into develop
|
2016-07-05 15:11:52 +02:00 |
|
Marion Muszynski
|
e79421073d
|
adding pending orders to stock report
|
2016-07-05 15:11:33 +02:00 |
|
Marion Muszynski
|
e6859f7a85
|
Merge branch 'ticket-preheaderRSS' into develop
|
2016-07-04 18:20:24 +02:00 |
|
Marion Muszynski
|
95b176601a
|
adding preheader rss emarsys
|
2016-07-04 18:20:03 +02:00 |
|
Marion Muszynski
|
6e2d4dff6e
|
Merge branch 'ticket-simplemulti_invoice' into develop
|
2016-07-04 17:51:51 +02:00 |
|
Marion Muszynski
|
9391dd015a
|
adding column in admin invoice for same brand in multi sale
|
2016-07-04 17:51:26 +02:00 |
|
Marion Muszynski
|
45bf5e67b9
|
Merge branch 'adding-log-bo'
|
2016-07-04 17:43:25 +02:00 |
|
Marion Muszynski
|
2215524cc8
|
Merge branch 'adding-log-bo' into develop
|
2016-07-04 17:42:24 +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
|
125944c83f
|
Merge branch 'adding-log-bo' into develop
|
2016-07-04 17:34:16 +02:00 |
|
Marion Muszynski
|
8dbbf309bf
|
fix
|
2016-07-04 17:33:56 +02:00 |
|
Marion Muszynski
|
f1bf9ee3c1
|
Merge branch 'adding-log-bo' into develop
|
2016-07-04 17:30:47 +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
|
1bb5ccc889
|
Merge branch 'modif-css' into develop
|
2016-07-01 11:29:20 +02:00 |
|
Marion Muszynski
|
6a87ea0460
|
modif add button
|
2016-07-01 11:29:00 +02:00 |
|
Marion Muszynski
|
c7aa42f883
|
fix conflict
|
2016-07-01 11:20:49 +02:00 |
|
Marion Muszynski
|
e40768c734
|
modif img reduction on product list
|
2016-07-01 11:18:52 +02:00 |
|
Marion Muszynski
|
155dd48cad
|
fix conflict
|
2016-07-01 11:02:09 +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
|
e695afb543
|
Merge branch 'ticket-simplemulti_front' into develop
|
2016-06-30 10:48:06 +02:00 |
|
Marion Muszynski
|
f99cacd293
|
small update for mobile site
|
2016-06-30 10:47:46 +02:00 |
|
Marion Muszynski
|
e7f0c678de
|
fix conflict
|
2016-06-29 15:53:34 +02:00 |
|
Marion Muszynski
|
760bd50c06
|
adding sentence according delivery delay
|
2016-06-29 15:52:03 +02:00 |
|
Marion Muszynski
|
7fa45bf40f
|
Merge branch 'ticket-simplemulti_front' into develop
|
2016-06-29 09:59:37 +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
|
69bf2773e6
|
Merge branch 'ticket-blockbestsellerProduct' into develop
|
2016-06-28 16:16:02 +02:00 |
|
Marion Muszynski
|
e6585427ee
|
fix
|
2016-06-28 16:15:41 +02:00 |
|
Marion Muszynski
|
2b726927cf
|
Merge branch 'ticket-blockbestsellerProduct' into develop
|
2016-06-28 16:07:49 +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
|
9fb4d1786c
|
Merge branch 'ticket-simplemulti_invoice' into develop
|
2016-06-28 15:46:05 +02:00 |
|
Marion Muszynski
|
91ca51a960
|
modif cookie
|
2016-06-28 15:45:43 +02:00 |
|
Marion Muszynski
|
7f2ebe23f4
|
Merge branch 'ticket-simplemulti_front' into develop
|
2016-06-28 15:19:53 +02:00 |
|
Marion Muszynski
|
f8af1f0a71
|
modif tpl trad
|
2016-06-28 15:19:31 +02:00 |
|
Marion Muszynski
|
18238f3c9d
|
Merge branch 'ticket-blockbestsellerProduct' into develop
|
2016-06-28 15:03:29 +02:00 |
|
Marion Muszynski
|
163cc3ac04
|
adding html bind
|
2016-06-28 15:03:07 +02:00 |
|
Marion Muszynski
|
757c557a07
|
fix conflict
|
2016-06-28 14:47:38 +02:00 |
|
Marion Muszynski
|
8a0b80e15e
|
pop error cart
|
2016-06-28 14:45:48 +02:00 |
|