Marion Muszynski
|
801cb2af23
|
add delete function for category mobile image
|
2017-09-25 10:59:34 +02:00 |
|
Marion Muszynski
|
063da75c27
|
Merge branch 'task-imgForMobile'
|
2017-09-25 10:22:22 +02:00 |
|
Marion Muszynski
|
8dec632958
|
Merge branch 'ticket-14292-expeDateInBoOrder'
|
2017-09-22 15:31:32 +02:00 |
|
Marion Muszynski
|
7bbcc3eb59
|
add expedition date on adminorder
|
2017-09-22 15:31:16 +02:00 |
|
Marion Muszynski
|
4b985fb501
|
Merge branch 'ticket-13943-ResetBOpassword'
|
2017-09-21 15:40:57 +02:00 |
|
Christophe Latour
|
97ec0df08f
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-09-21 15:38:07 +02:00 |
|
Marion Muszynski
|
b2d1f7bf90
|
Merge branch 'ticket-13943-ResetBOpassword' into develop
|
2017-09-21 15:37:57 +02:00 |
|
Marion Muszynski
|
2eddfa25b7
|
fix install module
|
2017-09-21 15:37:41 +02:00 |
|
Christophe Latour
|
b41bfbb9a0
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-09-21 15:29:02 +02:00 |
|
Marion Muszynski
|
2add8ce479
|
Merge branch 'ticket-13943-ResetBOpassword' into develop
|
2017-09-21 15:28:25 +02:00 |
|
Marion Muszynski
|
31e6272a31
|
add mail for reset password
|
2017-09-21 15:26:55 +02:00 |
|
Marion Muszynski
|
c962994c82
|
Merge branch 'ticket-14161-UncombinableSale'
|
2017-09-20 16:53:52 +02:00 |
|
Christophe Latour
|
68332205dd
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-09-20 16:44:55 +02:00 |
|
Marion Muszynski
|
26ab7a6a5e
|
Merge branch 'ticket-14161-UncombinableSale' into develop
|
2017-09-20 16:44:36 +02:00 |
|
Marion Muszynski
|
da99ec2597
|
fix lang
|
2017-09-20 16:44:15 +02:00 |
|
Michael RICOIS
|
e694616107
|
Merge remote-tracking branch 'origin/ticket-13149'
|
2017-09-19 11:26:32 +02:00 |
|
Christophe Latour
|
fa2704e7b8
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-09-18 17:49:50 +02:00 |
|
Michael RICOIS
|
2bb6aeaeae
|
Merge remote-tracking branch 'origin/ticket-13149' into develop
|
2017-09-18 17:49:37 +02:00 |
|
Michael RICOIS
|
e35c4042ad
|
Forget Category override
|
2017-09-18 17:49:08 +02:00 |
|
Christophe Latour
|
0e24593087
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-09-18 17:46:14 +02:00 |
|
Michael RICOIS
|
8c1c166572
|
Merge branch 'ticket-13149' into develop
|
2017-09-18 17:45:29 +02:00 |
|
Michael RICOIS
|
f0e00394fa
|
Clean ajax and add parameter to not loop in categoryUpdate hook
|
2017-09-18 17:44:09 +02:00 |
|
Christophe Latour
|
ad89bdc594
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-09-18 11:51:46 +02:00 |
|
Marion Muszynski
|
9ec62bab45
|
Merge branch 'ticket-14161-UncombinableSale' into develop
|
2017-09-18 11:51:38 +02:00 |
|
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 |
|