Marion Muszynski
|
e7a93aa24e
|
Merge branch 'ticket-filterOrders' into develop
|
2016-05-13 10:41:38 +02:00 |
|
Marion Muszynski
|
7e7b335749
|
modif filter adminOrder
|
2016-05-13 10:41:09 +02:00 |
|
Srv Bebeboutik
|
5a7c3a0241
|
modif cart
|
2016-05-13 10:37:05 +02:00 |
|
Srv Bebeboutik
|
3a4f5414d8
|
fix conflict
|
2016-05-12 12:12:42 +02:00 |
|
Srv Bebeboutik
|
34b34929ef
|
push la modif de cart
|
2016-05-12 12:10:50 +02:00 |
|
Marion Muszynski
|
19ed76d6ba
|
Merge branch 'ticket-flexibilite'
|
2016-05-12 12:06:43 +02:00 |
|
Marion Muszynski
|
e7d540092a
|
Merge branch 'tiket-productTemplate' into develop
|
2016-05-12 11:51:16 +02:00 |
|
Marion Muszynski
|
d2f0f5e7ad
|
add template
|
2016-05-12 11:50:42 +02:00 |
|
Marion Muszynski
|
7affaf4a41
|
Merge branch 'ticket-flexibilite' into develop
|
2016-05-12 10:18:44 +02:00 |
|
Marion Muszynski
|
ebdd485182
|
modif id carrier in cart
|
2016-05-12 10:18:15 +02:00 |
|
Marion Muszynski
|
89f5c51bcb
|
Merge branch 'ticket-newImport' into develop
|
2016-05-11 10:13:52 +02:00 |
|
Marion Muszynski
|
51a8fd9437
|
adding of new import for product customs
|
2016-05-11 10:13:20 +02:00 |
|
Marion Muszynski
|
5fcccda0ee
|
Merge branch 'ticket-parrainageMobile'
|
2016-05-10 16:30:25 +02:00 |
|
Marion Muszynski
|
696a5fa546
|
Merge branch 'ticket-parrainageMobile' into develop
|
2016-05-10 16:29:02 +02:00 |
|
Marion Muszynski
|
f8e85b7a41
|
hotfix trim email
|
2016-05-10 16:28:32 +02:00 |
|
Marion Muszynski
|
56683972c7
|
Merge branch 'tiket-productTemplate' into develop
|
2016-05-10 16:14:11 +02:00 |
|
Marion Muszynski
|
183ad376d0
|
modif for delay flag
|
2016-05-10 16:13:48 +02:00 |
|
Marion Muszynski
|
4fdccad3d5
|
Merge branch 'ticket-fidelite' into develop
|
2016-05-10 15:45:01 +02:00 |
|
Marion Muszynski
|
320c6922c8
|
modif of credit format in header
|
2016-05-10 15:44:36 +02:00 |
|
Marion Muszynski
|
9bc89e472a
|
Merge branch 'ticket-flexibilite' into develop
|
2016-05-09 18:02:50 +02:00 |
|
Marion Muszynski
|
f0d183580a
|
modif cart
|
2016-05-09 18:02:20 +02:00 |
|
Marion Muszynski
|
7604dca9cd
|
Merge branch 'ticket-flexibilite' into develop
|
2016-05-09 17:44:43 +02:00 |
|
Marion Muszynski
|
ffbb3232b9
|
modif soflex
|
2016-05-09 17:43:57 +02:00 |
|
Marion Muszynski
|
944fe22c8d
|
Merge branch 'tiket-productTemplate' into develop
|
2016-05-04 16:20:10 +02:00 |
|
Marion Muszynski
|
8e8e2793ae
|
modif arroaw slider
|
2016-05-04 16:19:18 +02:00 |
|
Marion Muszynski
|
653d0031a6
|
Merge branch 'tiket-productTemplate' into develop
|
2016-05-04 16:00:55 +02:00 |
|
Marion Muszynski
|
e85b593e35
|
modif trad
|
2016-05-04 16:00:32 +02:00 |
|
Marion Muszynski
|
d54abebb29
|
Merge branch 'tiket-productTemplate' into develop
|
2016-05-04 15:37:03 +02:00 |
|
Marion Muszynski
|
231dbe444e
|
modif css
|
2016-05-04 15:36:41 +02:00 |
|
Marion Muszynski
|
de66d55c55
|
Merge branch 'tiket-productTemplate' into develop
|
2016-05-04 15:31:51 +02:00 |
|
Marion Muszynski
|
402ac44f49
|
slider blockbestsellers in product page
|
2016-05-04 15:31:28 +02:00 |
|
Marion Muszynski
|
b88d79c1cc
|
Merge branch 'ticket-fidelite' into develop
|
2016-05-03 15:58:00 +02:00 |
|
Marion Muszynski
|
c8fb4bf96b
|
petite modif
|
2016-05-03 15:57:35 +02:00 |
|
Marion Muszynski
|
13bcd0d8c6
|
Merge branch 'ticket-fidelite' into develop
|
2016-05-03 15:48:39 +02:00 |
|
Marion Muszynski
|
831cdefdf8
|
modif translation
|
2016-05-03 15:48:17 +02:00 |
|
Marion Muszynski
|
2a10c6a2fe
|
fix conflict in css
|
2016-05-03 15:40:01 +02:00 |
|
Marion Muszynski
|
63db0cc73c
|
adding in blocuserinfo
|
2016-05-03 15:38:20 +02:00 |
|
Marion Muszynski
|
b7f2c64d64
|
Merge branch 'tiket-productTemplate' into develop
|
2016-05-03 15:04:27 +02:00 |
|
Marion Muszynski
|
60cb1752c7
|
modif tpl product mobile
|
2016-05-03 15:03:54 +02:00 |
|
Alexandre Simonet
|
cc86b7849d
|
add rss fluxcatalogue
|
2016-05-03 12:20:54 +02:00 |
|
Thibault UBUNTU
|
80206ad452
|
Merge branch 'paypal_billing' into develop
|
2016-05-03 12:09:10 +02:00 |
|
Thibault UBUNTU
|
25bf39f711
|
trad es
|
2016-05-03 12:08:55 +02:00 |
|
Marion Muszynski
|
e69dd75074
|
Merge branch 'tiket-productTemplate' into develop
|
2016-05-02 17:49:43 +02:00 |
|
Marion Muszynski
|
77f391e66d
|
Merge branch 'ticket-fidelite' into develop
|
2016-05-02 17:48:42 +02:00 |
|
Marion Muszynski
|
bf39d6aa82
|
modif css
|
2016-05-02 17:48:16 +02:00 |
|
Marion Muszynski
|
388a6bfc10
|
modif css
|
2016-05-02 17:46:53 +02:00 |
|
Marion Muszynski
|
f1a4d79daf
|
Merge branch 'tiket-productTemplate' into develop
|
2016-05-02 17:20:51 +02:00 |
|
Marion Muszynski
|
990ddefe16
|
border radius add to cart
|
2016-05-02 17:20:18 +02:00 |
|
Thibault UBUNTU
|
7e778b24b6
|
Merge branch 'paypal_billing' into develop
|
2016-05-02 16:01:44 +02:00 |
|
Thibault UBUNTU
|
23c26bf0ee
|
back to account mobile
|
2016-05-02 16:01:29 +02:00 |
|