root
|
bce5419334
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-06-08 13:06:47 +02:00 |
|
Marion Muszynski
|
96c04a1d8d
|
Merge branch 'ticket-9103-TradCategoryscroll' into develop
|
2017-06-08 13:06:36 +02:00 |
|
Marion Muszynski
|
7d1934296b
|
fix translation module categoryscroll
|
2017-06-08 13:06:19 +02:00 |
|
root
|
82a84043ba
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-06-08 12:24:04 +02:00 |
|
Marion Muszynski
|
ff6591564d
|
Merge branch 'ticket-9103-UrlMetaCategory' into develop
|
2017-06-08 12:23:50 +02:00 |
|
Marion Muszynski
|
6d4cf5d1bd
|
fill and translate meta auto
|
2017-06-08 12:23:30 +02:00 |
|
Marion Muszynski
|
732dde9165
|
Merge branch 'ticket-9103-saleBg'
|
2017-06-08 11:52:49 +02:00 |
|
root
|
64b3c1a568
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-06-08 11:52:33 +02:00 |
|
Marion Muszynski
|
d313207099
|
Merge branch 'ticket-9103-saleBg' into develop
|
2017-06-08 11:51:50 +02:00 |
|
Marion Muszynski
|
35bcc57509
|
upload fr img for es when only fr sale bg is loaded
|
2017-06-08 11:51:34 +02:00 |
|
Marion Muszynski
|
0fc01207fc
|
Merge branch 'ticket-13166-ReturnProcess'
|
2017-06-07 15:30:50 +02:00 |
|
Marion Muszynski
|
98ddbdd50f
|
add possibility to resend all order products
|
2017-06-07 15:30:36 +02:00 |
|
Marion Muszynski
|
3f19e5c5cd
|
Merge branch 'ticket-13166-ReturnProcess'
|
2017-06-07 15:07:34 +02:00 |
|
Marion Muszynski
|
bed6683539
|
fix and add shipping number list in order
|
2017-06-07 15:07:19 +02:00 |
|
Marion Muszynski
|
6b8b75c74d
|
Merge branch 'ticket-13166-ReturnProcess'
|
2017-06-07 12:01:34 +02:00 |
|
Marion Muszynski
|
e5266e5bbf
|
fix missing functions and color return product
|
2017-06-07 12:01:15 +02:00 |
|
Marion Muszynski
|
8f83232c06
|
Merge branch 'ticket-13222-PhileaStock'
|
2017-06-07 10:21:36 +02:00 |
|
Marion Muszynski
|
1646e22344
|
addition of script for expected stock
|
2017-06-07 10:21:15 +02:00 |
|
Marion Muszynski
|
b9e1f91c85
|
Merge branch 'ticket-13166-ReturnProcess'
|
2017-06-06 12:19:54 +02:00 |
|
Marion Muszynski
|
168a947797
|
Merge branch 'ticket-13166-ReturnProcess' into develop
|
2017-06-06 12:19:35 +02:00 |
|
Marion Muszynski
|
06054727e0
|
reverse order of returns
|
2017-06-06 12:19:05 +02:00 |
|
Marion Muszynski
|
c5f4008314
|
Merge branch 'ticket-13166-ReturnProcess'
|
2017-06-06 12:00:59 +02:00 |
|
root
|
84414c3d66
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-06-06 11:58:34 +02:00 |
|
Marion Muszynski
|
21925a54ea
|
Merge branch 'ticket-13166-ReturnProcess' into develop
|
2017-06-06 11:58:17 +02:00 |
|
Marion Muszynski
|
be7863e514
|
fix instructions and reasons
|
2017-06-06 11:57:55 +02:00 |
|
Marion Muszynski
|
6707cbb33e
|
Merge branch 'fix-cookieMobile'
|
2017-06-02 15:19:21 +02:00 |
|
Marion Muszynski
|
043cfee852
|
fix cookie close bug on mobile
|
2017-06-02 15:19:06 +02:00 |
|
root
|
2e97e43ae0
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-06-02 11:20:51 +02:00 |
|
Marion Muszynski
|
ff69aa7935
|
Merge branch 'ticket-13166-ReturnProcess' into develop
|
2017-06-02 11:20:41 +02:00 |
|
Marion Muszynski
|
3d6388f298
|
fixes
|
2017-06-02 11:20:27 +02:00 |
|
root
|
6ade521b6a
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-06-02 11:16:52 +02:00 |
|
Marion Muszynski
|
785a651dfb
|
Merge branch 'ticket-13166-ReturnProcess' into develop
|
2017-06-02 11:16:41 +02:00 |
|
Marion Muszynski
|
efa31b77fa
|
fix
|
2017-06-02 11:16:25 +02:00 |
|
root
|
d0b2205675
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-06-02 11:15:25 +02:00 |
|
Marion Muszynski
|
f17c39cf53
|
Merge branch 'ticket-13166-ReturnProcess' into develop
|
2017-06-02 11:14:45 +02:00 |
|
Marion Muszynski
|
ec41497ea4
|
ended return after resending
|
2017-06-02 11:14:25 +02:00 |
|
Marion Muszynski
|
076d725227
|
Merge branch 'fix-CarrierLogo'
|
2017-06-02 10:21:24 +02:00 |
|
Marion Muszynski
|
cfe960cfa2
|
fix logo carrier when it is a dropshipping
|
2017-06-02 10:21:06 +02:00 |
|
root
|
38827b2287
|
fix from prod
|
2017-06-01 17:47:41 +02:00 |
|
Marion Muszynski
|
cec9908432
|
Merge branch 'fix-carriers'
|
2017-06-01 17:44:56 +02:00 |
|
Marion Muszynski
|
a04ec97082
|
fix
|
2017-06-01 17:44:43 +02:00 |
|
Marion Muszynski
|
3324df2b5d
|
Merge branch 'ticket-13306-ModifES'
|
2017-06-01 13:24:19 +02:00 |
|
root
|
f492ee3100
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-06-01 12:59:50 +02:00 |
|
Marion Muszynski
|
0cde6166bb
|
Merge branch 'ticket-13306-ModifES' into develop
|
2017-06-01 12:59:39 +02:00 |
|
Marion Muszynski
|
2395374281
|
checked cdc for es version
|
2017-06-01 12:59:00 +02:00 |
|
root
|
6bd234cbe2
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-06-01 12:53:39 +02:00 |
|
Marion Muszynski
|
2ba4eb0a09
|
Merge branch 'ticket-13306-ModifES' into develop
|
2017-06-01 12:53:29 +02:00 |
|
Marion Muszynski
|
221bc66f44
|
modif for carrier logo
|
2017-06-01 12:53:13 +02:00 |
|
root
|
b89a5ed2e0
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-06-01 12:27:38 +02:00 |
|
Marion Muszynski
|
fc042bbd16
|
Merge branch 'ticket-13306-ModifES' into develop
|
2017-06-01 12:27:24 +02:00 |
|