root
|
132ecc247b
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-07-21 12:07:11 +02:00 |
|
Marion Muszynski
|
ecd5c91ec4
|
Merge branch 'ticket-13755-LogStats' into develop
|
2017-07-21 12:07:02 +02:00 |
|
Marion Muszynski
|
4bb62e4ee7
|
fix carriers in report query
|
2017-07-21 12:06:48 +02:00 |
|
root
|
f1a85ee4cc
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-07-21 11:52:57 +02:00 |
|
Marion Muszynski
|
0d916a5d3e
|
Merge branch 'ticket-13755-LogStats' into develop
|
2017-07-21 11:52:45 +02:00 |
|
Marion Muszynski
|
b990aee5f2
|
refont stock log
|
2017-07-21 11:52:28 +02:00 |
|
root
|
bc29984ea7
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-07-21 11:17:45 +02:00 |
|
Marion Muszynski
|
8ebad0868b
|
Merge branch 'ticket-13754-fixSalePosition' into develop
|
2017-07-21 11:17:21 +02:00 |
|
Marion Muszynski
|
8a1b3793da
|
resort sales after addition of new one
|
2017-07-21 11:17:05 +02:00 |
|
root
|
5488ea8d7b
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-07-20 16:54:03 +02:00 |
|
Marion Muszynski
|
3042613293
|
Merge branch 'fix-mondialRealy' into develop
|
2017-07-20 16:53:01 +02:00 |
|
Marion Muszynski
|
6a88e687c0
|
Merge branch 'ticket-13754-fixSalePosition' into develop
|
2017-07-20 16:51:38 +02:00 |
|
Marion Muszynski
|
e1663b365b
|
fixation of sale position
|
2017-07-20 16:51:19 +02:00 |
|
Marion Muszynski
|
27d0e4666d
|
Merge branch 'fix-mondialRealy'
|
2017-07-20 12:06:09 +02:00 |
|
Marion Muszynski
|
738757a276
|
fix css MR fancy box
|
2017-07-20 12:05:54 +02:00 |
|
Marion Muszynski
|
4e0938b32e
|
fix sale position
|
2017-07-20 11:37:45 +02:00 |
|
root
|
7be76ed1f1
|
trad from prod
|
2017-07-19 15:56:38 +02:00 |
|
root
|
1a975aea61
|
fix MR from prod
|
2017-07-19 14:34:05 +02:00 |
|
root
|
e59bdde6be
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-07-18 12:13:04 +02:00 |
|
Marion Muszynski
|
ed01b1e22a
|
Merge branch 'ticket-12743-SavSupplier' into develop
|
2017-07-18 12:12:40 +02:00 |
|
Marion Muszynski
|
05062d558b
|
fix wordwrap
|
2017-07-18 12:12:25 +02:00 |
|
root
|
d3208d27e8
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-07-18 12:07:20 +02:00 |
|
Marion Muszynski
|
bd8088a915
|
Merge branch 'ticket-12743-SavSupplier' into develop
|
2017-07-18 12:07:06 +02:00 |
|
Marion Muszynski
|
372fb0b51c
|
add some info
|
2017-07-18 12:06:50 +02:00 |
|
Marion Muszynski
|
246121bc14
|
Merge branch 'ticket-13351-EdTag'
|
2017-07-18 10:38:35 +02:00 |
|
Marion Muszynski
|
3f3b5a0023
|
modif include to require
|
2017-07-18 10:38:23 +02:00 |
|
Marion Muszynski
|
bcbab8adbb
|
Merge branch 'ticket-13351-EdTag'
|
2017-07-18 10:36:19 +02:00 |
|
root
|
9b2d79466a
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-07-18 10:28:41 +02:00 |
|
Marion Muszynski
|
66d37d34c6
|
Merge branch 'ticket-13351-EdTag' into develop
|
2017-07-18 10:28:27 +02:00 |
|
Marion Muszynski
|
0bd93ed4b2
|
add module tracking tag
|
2017-07-18 10:28:05 +02:00 |
|
Marion Muszynski
|
ffd3b8adc4
|
Merge branch 'ticket-13351-EdTag' into develop
|
2017-07-18 10:27:34 +02:00 |
|
root
|
a993b2b36f
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-07-18 10:19:01 +02:00 |
|
Marion Muszynski
|
42bca45df3
|
Merge branch 'ticket-13564-giftOnShoppingCart' into develop
|
2017-07-18 10:18:50 +02:00 |
|
Marion Muszynski
|
0e5cbb2638
|
fix cart
|
2017-07-18 10:18:38 +02:00 |
|
root
|
f74384901a
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-07-18 10:07:50 +02:00 |
|
Marion Muszynski
|
e20992d824
|
Merge branch 'ticket-13564-giftOnShoppingCart' into develop
|
2017-07-18 10:07:13 +02:00 |
|
Marion Muszynski
|
1084d47e72
|
fix validate gift message
|
2017-07-18 10:06:57 +02:00 |
|
Marion Muszynski
|
d868d563f5
|
start of tracking tag
|
2017-07-18 09:56:24 +02:00 |
|
Marion Muszynski
|
ab2858cb9a
|
Merge branch 'ticket-13679-AntCustomGroup'
|
2017-07-17 11:01:15 +02:00 |
|
root
|
61d3b7cf0c
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-07-13 17:00:32 +02:00 |
|
Marion Muszynski
|
3e8e564e4e
|
Merge branch 'ticket-12743-SavSupplier' into develop
|
2017-07-13 17:00:18 +02:00 |
|
Marion Muszynski
|
0479310097
|
add quantity info
|
2017-07-13 17:00:02 +02:00 |
|
root
|
28d05025da
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-07-13 16:46:47 +02:00 |
|
Marion Muszynski
|
d7552c5d21
|
Merge branch 'ticket-12743-SavSupplier' into develop
|
2017-07-13 16:46:26 +02:00 |
|
Marion Muszynski
|
4589c86bb5
|
add module ant supplier demand
|
2017-07-13 16:46:11 +02:00 |
|
root
|
2ff204ac19
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-07-12 17:15:12 +02:00 |
|
Marion Muszynski
|
1ce931d256
|
Merge branch 'ticket-13679-AntCustomGroup' into develop
|
2017-07-12 17:14:49 +02:00 |
|
Marion Muszynski
|
adf8bc8185
|
add module custom group
|
2017-07-12 17:14:30 +02:00 |
|
Marion Muszynski
|
655b0e4236
|
Merge branch 'ticket-10648-fileUploadOnMobile'
|
2017-07-11 16:31:11 +02:00 |
|
root
|
98085e4186
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-07-11 16:21:52 +02:00 |
|