Marion Muszynski
|
c6559904ff
|
Merge branch 'ticket-fidelite' into develop
|
2016-04-21 17:57:17 +02:00 |
|
Marion Muszynski
|
36af8de7d8
|
correction int float second round
|
2016-04-21 17:56:54 +02:00 |
|
Marion Muszynski
|
e28d322bd1
|
Merge branch 'ticket-fidelite' into develop
|
2016-04-21 17:53:22 +02:00 |
|
Marion Muszynski
|
aaf2290d28
|
correction int float
|
2016-04-21 17:52:52 +02:00 |
|
Marion Muszynski
|
d3f7d66f95
|
fix conflict css
|
2016-04-21 17:44:16 +02:00 |
|
Marion Muszynski
|
35ee4a1c68
|
many update of module loyalty
|
2016-04-21 17:41:04 +02:00 |
|
Marion Muszynski
|
fa2d77b8b2
|
Merge branch 'ticket-fidelite' into develop
|
2016-04-21 12:39:56 +02:00 |
|
Marion Muszynski
|
a2e21669b0
|
correction bug newOrderHook
|
2016-04-21 12:39:07 +02:00 |
|
Marion Muszynski
|
d0644b680e
|
Merge branch 'ticket-fidelite' into develop
|
2016-04-21 12:15:31 +02:00 |
|
Marion Muszynski
|
e505c1e9db
|
other corrctions
|
2016-04-21 12:15:04 +02:00 |
|
Marion Muszynski
|
02bff329ca
|
Merge branch 'ticket-fidelite' into develop
|
2016-04-21 12:01:36 +02:00 |
|
Marion Muszynski
|
15f3b6fa20
|
modif tpl
|
2016-04-21 12:01:10 +02:00 |
|
Marion Muszynski
|
0d92bae9f9
|
Merge branch 'ticket-fidelite' into develop
|
2016-04-21 11:39:49 +02:00 |
|
Marion Muszynski
|
5d52bff134
|
corrections
|
2016-04-21 11:39:25 +02:00 |
|
Marion Muszynski
|
042d42d578
|
Merge branch 'ticket-fidelite' into develop
|
2016-04-21 11:32:06 +02:00 |
|
Marion Muszynski
|
ba0e8d29bc
|
modif tpl loyalty
|
2016-04-21 11:31:36 +02:00 |
|
Marion Muszynski
|
c8befd1ede
|
total modification of loyalty module
|
2016-04-21 11:14:33 +02:00 |
|
Thibault UBUNTU
|
6827513a88
|
Merge branch 'paypal_billing' into develop
|
2016-04-20 17:39:02 +02:00 |
|
Thibault UBUNTU
|
fa60d253e8
|
box paypal
|
2016-04-20 17:38:57 +02:00 |
|
Thibault UBUNTU
|
3cd9af191d
|
Merge branch 'paypal_billing' into develop
|
2016-04-20 17:35:17 +02:00 |
|
Thibault UBUNTU
|
bbee57249a
|
version mobile
|
2016-04-20 17:35:03 +02:00 |
|
Marion Muszynski
|
9f20e049de
|
Merge branch 'ticket-newExtracts' into develop
|
2016-04-20 15:59:31 +02:00 |
|
Marion Muszynski
|
753b17fcba
|
petite rectification quantity_sold
|
2016-04-20 15:58:47 +02:00 |
|
Marion Muszynski
|
fd5bccadd7
|
begin loyalty
|
2016-04-20 15:33:56 +02:00 |
|
Thibault UBUNTU
|
c37df06d47
|
add reassurance text
|
2016-04-20 15:32:12 +02:00 |
|
Thibault UBUNTU
|
6512b4aaaa
|
Merge branch 'develop' of gitlab.antadis.fr:dev-antadis/bebeboutik into develop
|
2016-04-20 14:20:40 +02:00 |
|
Thibault UBUNTU
|
639d2402e6
|
Merge branch 'paypal_billing' into develop
|
2016-04-20 14:20:15 +02:00 |
|
Thibault UBUNTU
|
848dbdedc0
|
load payment paypal
|
2016-04-20 14:20:07 +02:00 |
|
Marion Muszynski
|
f2e0e80149
|
Merge branch 'ticket-landingpage' into develop
|
2016-04-20 12:35:50 +02:00 |
|
Marion Muszynski
|
4c4c069588
|
modif width button
|
2016-04-20 12:35:20 +02:00 |
|
Marion Muszynski
|
789b011f7f
|
Merge branch 'ticket-newExtracts' into develop
|
2016-04-20 11:59:27 +02:00 |
|
Marion Muszynski
|
ecf913626f
|
update extract names
|
2016-04-20 11:59:02 +02:00 |
|
Marion Muszynski
|
7ff21f8a76
|
Merge branch 'ticket-newExtracts' into develop
|
2016-04-20 11:38:26 +02:00 |
|
Marion Muszynski
|
c63769824e
|
add 2 new extracts for deb
|
2016-04-20 11:37:50 +02:00 |
|
Marion Muszynski
|
219b6dabb3
|
Merge branch 'ticket-consumable'
|
2016-04-18 16:17:30 +02:00 |
|
Marion Muszynski
|
ca6587052b
|
change id consumable for prod
|
2016-04-18 16:17:04 +02:00 |
|
Marion Muszynski
|
ffb8f1f3c2
|
Merge branch 'ticket-consumable' into develop
|
2016-04-18 16:14:40 +02:00 |
|
Marion Muszynski
|
cbbaf9c8e0
|
modif left_img.tpl
|
2016-04-18 16:14:19 +02:00 |
|
Marion Muszynski
|
e15f382530
|
Merge branch 'ticket-consumable' into develop
|
2016-04-18 16:03:42 +02:00 |
|
Marion Muszynski
|
1c0d70688c
|
modif categoryimg
|
2016-04-18 16:03:17 +02:00 |
|
Marion Muszynski
|
f288f1ce8d
|
Merge branch 'ticket-landingpage' into develop
|
2016-04-18 15:22:50 +02:00 |
|
Marion Muszynski
|
d7b7e7abc6
|
modif connect button in landing page
|
2016-04-18 15:22:00 +02:00 |
|
Marion Muszynski
|
e2cc8ff3fd
|
Merge branch 'ticket-extract'
|
2016-04-15 16:48:37 +02:00 |
|
Marion Muszynski
|
ef01566b17
|
Merge branch 'ticket-extract' into develop
|
2016-04-15 12:39:14 +02:00 |
|
Marion Muszynski
|
f0e2a7481a
|
fix to order image by position
|
2016-04-15 12:38:31 +02:00 |
|
Marion Muszynski
|
c1e1f78057
|
Merge branch 'ticket-extract' into develop
|
2016-04-15 12:05:53 +02:00 |
|
Marion Muszynski
|
cdd8b21bfe
|
add nc8 id_country into export sales
|
2016-04-15 12:05:25 +02:00 |
|
Marion Muszynski
|
92e77117f8
|
Merge branch 'ticket-consumable' into develop
|
2016-04-15 11:46:36 +02:00 |
|
Marion Muszynski
|
e56cf154f7
|
Merge branch 'ticket-consumable'
|
2016-04-15 11:44:09 +02:00 |
|
Marion Muszynski
|
d0a702380f
|
update css
|
2016-04-15 11:43:42 +02:00 |
|