Marion Muszynski
|
d4722a7e81
|
order in search product
|
2016-04-14 13:06:06 +02:00 |
|
Marion Muszynski
|
89aa68b911
|
Merge branch 'ticket-landingpage' into develop
|
2016-04-13 13:06:52 +02:00 |
|
Marion Muszynski
|
0a0859d9dd
|
add hook for site_mobile
|
2016-04-13 13:06:28 +02:00 |
|
Marion Muszynski
|
7496b8fb5d
|
Merge branch 'ticket-extract' into develop
|
2016-04-13 12:23:22 +02:00 |
|
Marion Muszynski
|
2d1d12c07e
|
update extract
|
2016-04-13 12:22:55 +02:00 |
|
Marion Muszynski
|
6c6b3472e5
|
Merge branch 'ticket-braderie'
|
2016-04-13 10:45:18 +02:00 |
|
Marion Muszynski
|
39451cb3c6
|
fix conflict
|
2016-04-13 10:41:45 +02:00 |
|
Marion Muszynski
|
d326f1bb59
|
update adminProducts order
|
2016-04-13 10:39:29 +02:00 |
|
Marion Muszynski
|
f38db51e45
|
fix conflict
|
2016-04-12 18:07:38 +02:00 |
|
Marion Muszynski
|
616055dce2
|
Merge branch 'ticket-braderie'
|
2016-04-12 17:40:11 +02:00 |
|
Marion Muszynski
|
7a131e2bef
|
correction ordre AdminProduct
|
2016-04-12 17:39:47 +02:00 |
|
Marion Muszynski
|
dd6970444f
|
Merge branch 'ticket-braderie'
|
2016-04-12 16:17:41 +02:00 |
|
Marion Muszynski
|
9a576cd82d
|
fix conflict braderie
|
2016-04-12 16:15:40 +02:00 |
|
Marion Muszynski
|
43a24d1c7a
|
update braderie and rack
|
2016-04-12 16:11:08 +02:00 |
|
Marion Muszynski
|
0b0ebcb26f
|
fix conflict consommables
|
2016-04-12 15:17:45 +02:00 |
|
Marion Muszynski
|
09299f983e
|
add id_sale and id_cat to define for consumable
|
2016-04-12 15:07:24 +02:00 |
|
Marion Muszynski
|
b7fd07aec7
|
Merge branch 'ticket-braderie'
|
2016-04-11 12:17:33 +02:00 |
|
Marion Muszynski
|
23e5188aa1
|
Merge branch 'ticket-braderie' into develop
|
2016-04-11 12:14:04 +02:00 |
|
Marion Muszynski
|
19baa665a4
|
update braderie
|
2016-04-11 12:13:41 +02:00 |
|
Marion Muszynski
|
b287dc89de
|
begin ticket export ventes
|
2016-04-11 11:31:57 +02:00 |
|
Marion Muszynski
|
559042b904
|
Merge branch 'ticket-9791'
|
2016-04-08 16:16:13 +02:00 |
|
Marion Muszynski
|
b0f2148453
|
Merge branch 'ticket-9791' into develop
|
2016-04-08 16:15:19 +02:00 |
|
Marion Muszynski
|
2c371bb94d
|
update width bdc
|
2016-04-08 16:14:46 +02:00 |
|
Marion Muszynski
|
999faa694c
|
Merge branch 'ticket-9791'
|
2016-04-08 16:12:15 +02:00 |
|
Marion Muszynski
|
261ef37fd4
|
Merge branch 'ticket-9791' into develop
|
2016-04-08 16:10:18 +02:00 |
|
Marion Muszynski
|
b0a0abaf03
|
add ref to bdc log
|
2016-04-08 16:09:49 +02:00 |
|
Marion Muszynski
|
6a8d70f027
|
Merge branch 'ticket-landingpage' into develop
|
2016-04-08 15:38:21 +02:00 |
|
Marion Muszynski
|
786c055787
|
add trad
|
2016-04-08 15:37:53 +02:00 |
|
Marion Muszynski
|
1a0cf55865
|
Merge branch 'ticket-landingpage' into develop
|
2016-04-08 15:32:30 +02:00 |
|
Marion Muszynski
|
1d26459616
|
update landing page for connect button
|
2016-04-08 15:31:40 +02:00 |
|
Marion Muszynski
|
ace3f99035
|
Merge branch 'ticket-9791'
|
2016-04-08 11:30:43 +02:00 |
|
Marion Muszynski
|
5a21734d4f
|
Merge branch 'ticket-9791' into develop
|
2016-04-08 11:27:27 +02:00 |
|
Marion Muszynski
|
447362a0d7
|
optimisation excel bdc
|
2016-04-08 11:26:48 +02:00 |
|
Marion Muszynski
|
49e9ffa2fd
|
Merge branch 'rack-labelgenerate'
|
2016-04-08 10:36:20 +02:00 |
|
Marion Muszynski
|
f9962ab6d3
|
fix conflict adminProduct
|
2016-04-08 10:33:14 +02:00 |
|
Marion Muszynski
|
fe03a17200
|
add generate rack in labelgenerate
|
2016-04-08 10:27:46 +02:00 |
|
Marion Muszynski
|
8c7dc01d73
|
suite opti bdc
|
2016-04-08 10:11:11 +02:00 |
|
Marion Muszynski
|
967ad5d3c9
|
Merge branch 'ticket-9791' into develop
|
2016-04-07 11:47:30 +02:00 |
|
Marion Muszynski
|
a9ad96ad98
|
opti excel style to all bdc
|
2016-04-07 11:47:02 +02:00 |
|
Marion Muszynski
|
8b6a68e3ab
|
Merge branch 'ticket-9791' into develop
|
2016-04-07 10:53:57 +02:00 |
|
Marion Muszynski
|
613c58245f
|
optimization excel style bdc
|
2016-04-07 10:53:27 +02:00 |
|
Marion Muszynski
|
d02a74938b
|
opti bdc
|
2016-04-06 18:16:18 +02:00 |
|
Marion Muszynski
|
2c7864cd89
|
Merge branch 'ticket-9791'
|
2016-04-06 17:34:01 +02:00 |
|
Marion Muszynski
|
9d12fd401d
|
Merge branch 'ticket-9791' into develop
|
2016-04-06 17:32:58 +02:00 |
|
Marion Muszynski
|
5ce6d92b75
|
correction bug
|
2016-04-06 17:32:04 +02:00 |
|
Thibault UBUNTU
|
83675d8a08
|
Merge branch 'paypal_billing' into develop
|
2016-04-06 16:33:00 +02:00 |
|
Thibault UBUNTU
|
3e3d3a0e58
|
fix paypal order save
|
2016-04-06 16:32:50 +02:00 |
|
Thibault UBUNTU
|
3099ebe2ca
|
Merge branch 'develop' of gitlab.antadis.fr:dev-antadis/bebeboutik into develop
|
2016-04-06 15:52:31 +02:00 |
|
Thibault UBUNTU
|
552b46347e
|
v0.1 paypal billing
|
2016-04-06 15:52:14 +02:00 |
|
Marion Muszynski
|
60cf70493a
|
Merge branch 'ticket-9791'
|
2016-04-06 15:08:35 +02:00 |
|