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 |
|
Marion Muszynski
|
8bb987a812
|
Merge branch 'feature/fix_php_errors' into 'develop'
Fix error PHP5.5
See merge request !2
|
2017-08-31 16:42:39 +02:00 |
|
Christophe LATOUR
|
2c48d3107d
|
Fix error PHP5.5
- preg_replace() - /e modifier is deprecated in php 5.5
|
2017-08-31 16:30:39 +02:00 |
|
Christophe Latour
|
f65ac5d446
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-08-31 15:26:10 +02:00 |
|
Marion Muszynski
|
a40c1d6347
|
Merge branch 'ticket-13225-SpecificDelivery' into develop
|
2017-08-31 15:26:01 +02:00 |
|
Marion Muszynski
|
a362ab1aaf
|
Merge branch 'ticket-13225-SpecificDelivery'
|
2017-08-31 15:25:37 +02:00 |
|
Marion Muszynski
|
76e3fd9334
|
fix philea
|
2017-08-31 15:25:19 +02:00 |
|
Christophe Latour
|
f51adc21f0
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-08-31 15:19:52 +02:00 |
|
Marion Muszynski
|
0fa8432a12
|
Merge branch 'ticket-13156-FilterVP' into develop
|
2017-08-31 15:19:35 +02:00 |
|
Marion Muszynski
|
75853ae3e1
|
fix search query for attributes in category scroll
|
2017-08-31 15:19:19 +02:00 |
|
Marion Muszynski
|
360e6d51f6
|
Merge branch 'ticket-14068-updateStatLog'
|
2017-08-31 12:45:50 +02:00 |
|
Marion Muszynski
|
b01136e01f
|
reorder by firstname
|
2017-08-31 12:45:37 +02:00 |
|
Marion Muszynski
|
92ba04a63c
|
Merge branch 'ticket-14068-updateStatLog'
|
2017-08-31 10:50:06 +02:00 |
|
Marion Muszynski
|
992321abb8
|
changement stat log
|
2017-08-31 10:49:53 +02:00 |
|
Marion Muszynski
|
3f5fb0f30a
|
Merge branch 'ticket-14052-BadLinkForDiscount'
|
2017-08-30 10:03:21 +02:00 |
|
Marion Muszynski
|
b2e52a6c1b
|
fix bad link in menu
|
2017-08-30 10:03:09 +02:00 |
|
Christophe Latour
|
75cd7f80f6
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-08-29 09:51:35 +02:00 |
|
Marion Muszynski
|
fe2616ffbb
|
Merge branch 'ticket-13156-FilterVP' into develop
|
2017-08-29 09:50:54 +02:00 |
|
Marion Muszynski
|
cee909f10b
|
fix name and id of checkbox
|
2017-08-29 09:50:32 +02:00 |
|
Christophe Latour
|
cd5729905c
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-08-28 18:09:45 +02:00 |
|
Marion Muszynski
|
dcfd8aa511
|
Merge branch 'ticket-13156-FilterVP' into develop
|
2017-08-28 18:09:23 +02:00 |
|
Marion Muszynski
|
9f7da4b63a
|
update filter with all attribute groups of sale
|
2017-08-28 18:08:55 +02:00 |
|