Marion Muszynski
|
2c4ff88262
|
fix
|
2017-09-18 11:51:23 +02:00 |
|
Christophe Latour
|
318a03ef95
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-09-18 11:47:50 +02:00 |
|
Marion Muszynski
|
cf246105b7
|
Merge branch 'ticket-14161-UncombinableSale' into develop
|
2017-09-18 11:47:40 +02:00 |
|
Marion Muszynski
|
0f5228f6e8
|
update error mess from add to cart
|
2017-09-18 11:47:26 +02:00 |
|
Marion Muszynski
|
046a166499
|
Merge branch 'ticket-14209-AntAlert'
|
2017-09-18 11:17:13 +02:00 |
|
Christophe Latour
|
cc7d2048f5
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-09-18 11:15:24 +02:00 |
|
Marion Muszynski
|
28aea397b5
|
Merge branch 'ticket-14209-AntAlert' into develop
|
2017-09-18 11:15:04 +02:00 |
|
Marion Muszynski
|
7d297ca19b
|
fix AntAlert checking limits
|
2017-09-18 11:14:40 +02:00 |
|
root
|
9c2cce3d0b
|
fix from prod
|
2017-09-18 11:01:28 +02:00 |
|
Marion Muszynski
|
d8c2c369c9
|
reset password
|
2017-09-18 11:00:12 +02:00 |
|
Christophe Latour
|
980d967d49
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-09-15 16:20:22 +02:00 |
|
Michael RICOIS
|
b795763a6f
|
Merge branch 'ticket-13149' into develop
|
2017-09-15 16:20:09 +02:00 |
|
Michael RICOIS
|
bfae895cf1
|
Fix currentIndex
|
2017-09-15 16:19:44 +02:00 |
|
Christophe Latour
|
0127305b36
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-09-15 16:16:57 +02:00 |
|
Michael RICOIS
|
3502579c68
|
Merge branch 'ticket-13149' into develop
|
2017-09-15 16:15:36 +02:00 |
|
Michael RICOIS
|
e8fbfd92af
|
Add root category
|
2017-09-15 16:13:15 +02:00 |
|
Christophe Latour
|
94eaef5407
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-09-15 11:21:48 +02:00 |
|
Michael RICOIS
|
6f36a3c760
|
Merge branch 'ticket-13149' into develop
|
2017-09-15 11:19:38 +02:00 |
|
Michael RICOIS
|
8728d37bea
|
Display category children tree in a select
|
2017-09-15 10:57:16 +02:00 |
|
Christophe Latour
|
a45724cfcd
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-09-15 10:10:10 +02:00 |
|
Marion Muszynski
|
3aaf570fdc
|
Merge branch 'ticket-14161-UncombinableSale' into develop
|
2017-09-15 10:09:51 +02:00 |
|
Marion Muszynski
|
deec098272
|
close wanted sale
|
2017-09-15 10:09:15 +02:00 |
|
Marion Muszynski
|
ede8721e84
|
Merge branch 'ticket-14197-ConstantSale'
|
2017-09-13 10:51:12 +02:00 |
|
Christophe Latour
|
ee9cbfa54e
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-09-13 10:48:20 +02:00 |
|
Marion Muszynski
|
08c76ed5a2
|
Merge branch 'ticket-14197-ConstantSale' into develop
|
2017-09-13 10:48:13 +02:00 |
|
Marion Muszynski
|
ff0a9dd73a
|
fix
|
2017-09-13 10:48:03 +02:00 |
|
Marion Muszynski
|
8f8a970b1c
|
Merge branch 'ticket-14197-ConstantSale'
|
2017-09-13 10:44:17 +02:00 |
|
Christophe Latour
|
d0612df571
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-09-13 10:43:56 +02:00 |
|
Marion Muszynski
|
7e9926a502
|
Merge branch 'ticket-14197-ConstantSale' into develop
|
2017-09-13 10:43:41 +02:00 |
|
Marion Muszynski
|
783d5c55e8
|
add exception to best seller query
|
2017-09-13 10:43:23 +02:00 |
|
root
|
91e4537e41
|
fix and trad from prod
|
2017-09-13 10:28:19 +02:00 |
|
Christophe Latour
|
8a41935b89
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-09-12 12:08:49 +02:00 |
|
Marion Muszynski
|
51d0a8d3a4
|
Merge branch 'ticket-12868-WhiteBG' into develop
|
2017-09-12 12:08:39 +02:00 |
|
Marion Muszynski
|
965eab38e3
|
coloring background in white
|
2017-09-12 12:08:18 +02:00 |
|
Marion Muszynski
|
8f754edcc6
|
Merge branch 'ticket-14162-DecliInSAV'
|
2017-09-12 11:27:29 +02:00 |
|
Christophe Latour
|
0e379dafc9
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-09-12 11:27:16 +02:00 |
|
Marion Muszynski
|
ed34173096
|
Merge branch 'ticket-14162-DecliInSAV' into develop
|
2017-09-12 11:26:53 +02:00 |
|
Marion Muszynski
|
bb7f8474e7
|
fix css and show ordered quantity
|
2017-09-12 11:26:39 +02:00 |
|
Marion Muszynski
|
4435a061e2
|
add cacheRedis
|
2017-09-12 11:13:43 +02:00 |
|
Marion Muszynski
|
e272bede0e
|
select product name from order detail for sav
|
2017-09-12 11:12:31 +02:00 |
|
Marion Muszynski
|
a69acd27d6
|
Merge branch 'ticket-14138-ImageUrl'
|
2017-09-07 11:36:58 +02:00 |
|
Marion Muszynski
|
d1e1c62245
|
fix https on sale export
|
2017-09-07 11:36:48 +02:00 |
|
Marion Muszynski
|
7b72d11da9
|
start of cacheRedis
|
2017-09-07 11:30:57 +02:00 |
|
Christophe Latour
|
d0f1dc5ff1
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-09-01 12:02:01 +02:00 |
|
Marion Muszynski
|
379bec4ab4
|
Merge branch 'task-imgForMobile' into develop
|
2017-09-01 12:00:07 +02:00 |
|
Marion Muszynski
|
ec35cf0474
|
addition of new image format for application
|
2017-09-01 11:59:40 +02:00 |
|
root
|
61ed06dc22
|
Revert "Revert "fix from prod""
This reverts commit 38a13c74d6.
|
2017-09-01 11:22:11 +02:00 |
|
root
|
38a13c74d6
|
Revert "fix from prod"
This reverts commit cd44650b28.
|
2017-09-01 11:16:02 +02:00 |
|
root
|
cd44650b28
|
fix from prod
|
2017-09-01 11:06:24 +02:00 |
|
Christophe Latour
|
aec27740cb
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-08-31 16:57:37 +02:00 |
|