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 |
|
Marion Muszynski
|
91efe4469e
|
fix conflict adminProduct
|
2016-04-06 14:46:47 +02:00 |
|
Marion Muszynski
|
cc700bbebd
|
Merge branch 'ticket-9791' into develop
|
2016-04-06 13:21:41 +02:00 |
|
Marion Muszynski
|
bf619d7173
|
update trad in export bdc
|
2016-04-06 13:21:04 +02:00 |
|
Marion Muszynski
|
849edcdb12
|
fix conflict
|
2016-04-06 13:11:49 +02:00 |
|
Marion Muszynski
|
42704a03c7
|
creation bdc logistique
|
2016-04-06 13:09:54 +02:00 |
|
Marion Muszynski
|
c35bcc893a
|
avancées dans le bdc log
|
2016-04-05 18:15:35 +02:00 |
|
Marion Muszynski
|
2f57a773ff
|
Merge branch 'ticket-crazyegg'
|
2016-04-05 16:19:33 +02:00 |
|
Marion Muszynski
|
4309307488
|
modif script put in header.tpl
|
2016-04-05 16:18:52 +02:00 |
|
Marion Muszynski
|
c6887b7b84
|
suite ticket 9791
|
2016-04-05 16:14:32 +02:00 |
|
Marion Muszynski
|
12d18ea080
|
Merge branch 'ticket-9643'
|
2016-04-05 14:43:37 +02:00 |
|
Marion Muszynski
|
3a767a9e58
|
Merge branch 'ticket-ean'
|
2016-04-05 14:29:19 +02:00 |
|
Marion Muszynski
|
06ce40ba23
|
Merge branch 'alexandre-braderie' into develop
|
2016-04-05 14:21:17 +02:00 |
|
Marion Muszynski
|
c9023ddb9a
|
fix ref problem
|
2016-04-05 14:20:50 +02:00 |
|
Marion Muszynski
|
0db74b6f35
|
Merge branch 'ticket-crazyegg'
|
2016-04-04 17:31:23 +02:00 |
|
Marion Muszynski
|
f986fa77a6
|
ajout script crazyegg
|
2016-04-04 17:30:52 +02:00 |
|
Marion Muszynski
|
e94b10553d
|
begin bdc logistique
|
2016-04-04 17:23:15 +02:00 |
|
Marion Muszynski
|
4a41ef84eb
|
Merge branch 'ticket-ean' into develop
|
2016-04-04 15:54:44 +02:00 |
|
Marion Muszynski
|
d658b0eab2
|
update message confirm for deletion ean
|
2016-04-04 15:54:18 +02:00 |
|
Marion Muszynski
|
0880f08f07
|
Merge branch 'ticket-ean' into develop
|
2016-04-04 15:21:02 +02:00 |
|
Marion Muszynski
|
7fbf095387
|
update for delete ean in sale
|
2016-04-04 15:20:32 +02:00 |
|
Thibault UBUNTU
|
5769f5fb68
|
Merge branch 'develop' of gitlab.antadis.fr:dev-antadis/bebeboutik into develop
|
2016-04-04 15:02:02 +02:00 |
|
Thibault UBUNTU
|
688ba3bb8c
|
Merge branch 'paypal' into develop
|
2016-04-04 14:58:01 +02:00 |
|
Thibault UBUNTU
|
0395544c05
|
css mobile payment
|
2016-04-04 14:57:51 +02:00 |
|
Marion Muszynski
|
e76af013f5
|
Merge branch 'alexandre-braderie' into develop
|
2016-04-04 14:18:42 +02:00 |
|
Marion Muszynski
|
aa10c07dd6
|
update categories pb
|
2016-04-04 14:18:12 +02:00 |
|
Marion Muszynski
|
e8a15b1e19
|
Merge branch 'alexandre-braderie' into develop
|
2016-04-04 13:35:04 +02:00 |
|
Marion Muszynski
|
11a07506c0
|
update product name
|
2016-04-04 13:34:26 +02:00 |
|
Thibault UBUNTU
|
8471702ff7
|
fix
|
2016-04-04 13:25:38 +02:00 |
|
Thibault UBUNTU
|
39f9ff27e5
|
skin page payment
|
2016-04-04 13:24:07 +02:00 |
|
Thibault GUILLAUME
|
68ad666501
|
Merge branch 'develop' of gitlab.antadis.fr:dev-antadis/bebeboutik into develop
|
2016-04-04 11:50:10 +02:00 |
|
Thibault GUILLAUME
|
5beaf8e77e
|
fix conflict
|
2016-04-04 11:49:45 +02:00 |
|
Thibault GUILLAUME
|
3d0ebede08
|
test
|
2016-04-04 11:47:52 +02:00 |
|
Srv Bebeboutik
|
85c9a39043
|
https on facebook
|
2016-04-04 11:44:49 +02:00 |
|
Srv Bebeboutik
|
0ec932fb7f
|
add quote import
|
2016-04-04 11:44:16 +02:00 |
|
Marion Muszynski
|
4351791b67
|
fix conflict AdminPrivateSalesSales
|
2016-04-04 10:57:13 +02:00 |
|
Marion Muszynski
|
6279c24199
|
adding privatesale country
|
2016-04-04 10:49:37 +02:00 |
|
Marion Muszynski
|
5c9f1e5d29
|
Merge branch 'alexandre-braderie' into develop
|
2016-04-01 15:23:30 +02:00 |
|
Marion Muszynski
|
0c6bda8578
|
update reorder
|
2016-04-01 15:23:01 +02:00 |
|
Marion Muszynski
|
6cd59dce28
|
fix conflict
|
2016-04-01 15:07:22 +02:00 |
|
Marion Muszynski
|
815bc77445
|
adding reorder product
|
2016-04-01 15:03:40 +02:00 |
|
Marion Muszynski
|
7500debda5
|
Merge branch 'alexandre-braderie' into develop
|
2016-04-01 11:52:23 +02:00 |
|
Marion Muszynski
|
f1223a3289
|
update to add product in parent category
|
2016-04-01 11:51:58 +02:00 |
|
Thibault UBUNTU
|
54dea8836c
|
Revert "test"
This reverts commit 6d25f64984.
|
2016-03-31 17:56:58 +02:00 |
|