Marion Muszynski
|
699a06db48
|
fix conflict
|
2016-06-30 11:15:14 +02:00 |
|
Marion Muszynski
|
760bd50c06
|
adding sentence according delivery delay
|
2016-06-29 15:52:03 +02:00 |
|
Marion Muszynski
|
dd9831daa5
|
Merge branch 'ticket-blockbestsellerProduct'
|
2016-06-28 15:55:39 +02:00 |
|
Marion Muszynski
|
f8af1f0a71
|
modif tpl trad
|
2016-06-28 15:19:31 +02:00 |
|
Marion Muszynski
|
8a0b80e15e
|
pop error cart
|
2016-06-28 14:45:48 +02:00 |
|
Dylan Travers
|
c3f3e05427
|
Change pink color and modify comportement (Use All_quantities and not product_quantity
|
2016-06-27 12:25:22 +02:00 |
|
Marion Muszynski
|
ced379c219
|
ecotax sentence
|
2016-06-24 14:34:15 +02:00 |
|
Marion Muszynski
|
43646dd4bd
|
modif
|
2016-06-24 13:54:50 +02:00 |
|
Marion Muszynski
|
985bf52e83
|
update to add product with attribute to cart from bestsellers
|
2016-06-24 12:41:46 +02:00 |
|
Srv Bebeboutik
|
3b72e67b19
|
fix from prod
|
2016-06-24 10:09:27 +02:00 |
|
Marion Muszynski
|
03dd90bec5
|
update product tpl css
|
2016-06-23 10:16:07 +02:00 |
|
Marion Muszynski
|
d2d845a4d8
|
small fix
|
2016-06-22 17:50:52 +02:00 |
|
Marion Muszynski
|
7043f4b24a
|
other fix
|
2016-06-22 17:23:34 +02:00 |
|
Marion Muszynski
|
a6c46f9077
|
petit fix before prod
|
2016-06-22 17:08:09 +02:00 |
|
Marion Muszynski
|
3e65d4ed6d
|
fix css
|
2016-06-22 15:50:00 +02:00 |
|
Marion Muszynski
|
77b9c22014
|
fix conflicts
|
2016-06-22 15:03:36 +02:00 |
|
Marion Muszynski
|
a11f4ad97e
|
modif button color
|
2016-06-20 15:13:18 +02:00 |
|
Dylan Travers
|
1e674c4adf
|
Add 'X item(s) in stock' from ticket n°9890
|
2016-06-14 10:40:57 +02:00 |
|
Marion Muszynski
|
7af6d9ccd7
|
adding bg for sale
|
2016-06-10 16:49:43 +02:00 |
|
Marion Muszynski
|
7945d0c0ad
|
modif for ecotax style
|
2016-06-09 11:49:33 +02:00 |
|
Marion Muszynski
|
ba706ec6c9
|
Merge branch 'ticket-fidelite'
|
2016-06-08 16:33:40 +02:00 |
|
Marion Muszynski
|
d47310bc0a
|
redirect for es version
|
2016-06-08 16:27:56 +02:00 |
|
Marion Muszynski
|
2b2ae3fa8a
|
modif zoomdiv
|
2016-06-08 14:29:19 +02:00 |
|
Marion Muszynski
|
ab21f10643
|
Merge branch 'ticket-fidelite'
|
2016-06-08 12:53:58 +02:00 |
|
Marion Muszynski
|
dc85f8eca6
|
modif trad
|
2016-06-08 12:53:38 +02:00 |
|
Marion Muszynski
|
5c8e35adf2
|
Merge branch 'ticket-fidelite'
|
2016-06-08 12:16:37 +02:00 |
|
Marion Muszynski
|
83c4acc83d
|
opti request
|
2016-06-08 11:44:13 +02:00 |
|
Marion Muszynski
|
30b39b5776
|
fix conflicts
|
2016-06-08 10:53:07 +02:00 |
|
Marion Muszynski
|
b9f7b26a59
|
modif css shopping cart
|
2016-06-08 10:37:37 +02:00 |
|
Srv Bebeboutik
|
f96c85f584
|
trad
|
2016-06-07 16:01:57 +02:00 |
|
Srv Bebeboutik
|
7025bce024
|
add phrase frais de port popup
|
2016-06-07 12:52:15 +02:00 |
|
Marion Muszynski
|
cd3761a104
|
modif for site_mobile
|
2016-06-06 15:53:23 +02:00 |
|
Srv Bebeboutik
|
3ec698aa01
|
Merge branch 'master' of gitlab.antadis.fr:dev-antadis/bebeboutik
|
2016-06-06 12:03:14 +02:00 |
|
Srv Bebeboutik
|
1fab58c2d6
|
trad fr
|
2016-06-06 11:36:03 +02:00 |
|
Marion Muszynski
|
72545630a3
|
fix conflicts
|
2016-06-06 11:32:25 +02:00 |
|
Marion Muszynski
|
99b35ed57a
|
adding delivery description field for product
|
2016-06-03 12:07:12 +02:00 |
|
Marion Muszynski
|
289a55b5e4
|
small update
|
2016-06-01 14:39:30 +02:00 |
|
Marion Muszynski
|
e04cd105b8
|
modif code hex
|
2016-06-01 12:57:10 +02:00 |
|
Marion Muszynski
|
700c5dc9e0
|
css modif
|
2016-06-01 12:51:53 +02:00 |
|
Marion Muszynski
|
71ba5e170a
|
small update
|
2016-06-01 12:47:48 +02:00 |
|
Marion Muszynski
|
d59e49e3ba
|
update scrollbar color and more
|
2016-06-01 12:43:12 +02:00 |
|
Marion Muszynski
|
3e0ad8592d
|
update link
|
2016-06-01 11:23:37 +02:00 |
|
Marion Muszynski
|
96ca86fe85
|
modif error message
|
2016-06-01 10:57:31 +02:00 |
|
Marion Muszynski
|
ed9658e97e
|
comment facebook like
|
2016-05-31 16:33:28 +02:00 |
|
Marion Muszynski
|
cd56c49c48
|
modif css
|
2016-05-30 18:06:19 +02:00 |
|
Marion Muszynski
|
725251f138
|
fix css
|
2016-05-30 17:52:18 +02:00 |
|
Marion Muszynski
|
ed698c66f8
|
modif css
|
2016-05-30 17:45:51 +02:00 |
|
Marion Muszynski
|
0cf8ac97a9
|
modif css
|
2016-05-30 17:41:17 +02:00 |
|
Marion Muszynski
|
fd0de8d0aa
|
other fix tpl
|
2016-05-30 17:16:54 +02:00 |
|
Marion Muszynski
|
633643d0c7
|
fix pagination
|
2016-05-30 17:13:22 +02:00 |
|
Marion Muszynski
|
93344e1770
|
fix shopping-cart tpl
|
2016-05-30 16:33:03 +02:00 |
|
Marion Muszynski
|
d63a2d7d5a
|
addind field to config if delivery of sale is enabled only in fr
|
2016-05-30 15:42:20 +02:00 |
|
Marion Muszynski
|
a4ad9d98b0
|
modif tpl product css
|
2016-05-30 12:07:24 +02:00 |
|
Marion Muszynski
|
122cea0bc5
|
modif img product
|
2016-05-26 14:35:35 +02:00 |
|
Marion Muszynski
|
f479a0f9a7
|
modif css
|
2016-05-20 15:02:22 +02:00 |
|
Marion Muszynski
|
a356edf0df
|
modif picto
|
2016-05-20 12:38:25 +02:00 |
|
Marion Muszynski
|
64cfa67dbf
|
clean js console
|
2016-05-19 14:47:38 +02:00 |
|
Marion Muszynski
|
eb441d8edf
|
adding autocomplete postcode
|
2016-05-19 13:13:47 +02:00 |
|
Marion Muszynski
|
9eda48a6b4
|
modif img payment_2
|
2016-05-17 16:33:20 +02:00 |
|
Marion Muszynski
|
b7f247729f
|
modif tpl carrier et css
|
2016-05-17 15:56:27 +02:00 |
|
Marion Muszynski
|
70d2b78a74
|
modif site_mobile
|
2016-05-13 14:47:22 +02:00 |
|
Marion Muszynski
|
7e7feb5a52
|
ajust css and opti restrict addresses
|
2016-05-13 13:31:50 +02:00 |
|
Srv Bebeboutik
|
1fef6beb19
|
modif css site et mobile
|
2016-05-13 11:41:40 +02:00 |
|
Marion Muszynski
|
183ad376d0
|
modif for delay flag
|
2016-05-10 16:13:48 +02:00 |
|
Marion Muszynski
|
8e8e2793ae
|
modif arroaw slider
|
2016-05-04 16:19:18 +02:00 |
|
Marion Muszynski
|
e85b593e35
|
modif trad
|
2016-05-04 16:00:32 +02:00 |
|
Marion Muszynski
|
231dbe444e
|
modif css
|
2016-05-04 15:36:41 +02:00 |
|
Marion Muszynski
|
402ac44f49
|
slider blockbestsellers in product page
|
2016-05-04 15:31:28 +02:00 |
|
Marion Muszynski
|
c8fb4bf96b
|
petite modif
|
2016-05-03 15:57:35 +02:00 |
|
Marion Muszynski
|
831cdefdf8
|
modif translation
|
2016-05-03 15:48:17 +02:00 |
|
Marion Muszynski
|
63db0cc73c
|
adding in blocuserinfo
|
2016-05-03 15:38:20 +02:00 |
|
Thibault UBUNTU
|
25bf39f711
|
trad es
|
2016-05-03 12:08:55 +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
|
990ddefe16
|
border radius add to cart
|
2016-05-02 17:20:18 +02:00 |
|
Thibault UBUNTU
|
f15662e826
|
paypal suite
|
2016-05-02 15:30:12 +02:00 |
|
Marion Muszynski
|
23ede34fec
|
suite modif tpl product
|
2016-05-02 15:19:54 +02:00 |
|
Marion Muszynski
|
2033c1e937
|
update flag position
|
2016-04-29 16:14:41 +02:00 |
|
Marion Muszynski
|
f4597e397e
|
modif flag expe in product tpl
|
2016-04-29 16:04:17 +02:00 |
|
Marion Muszynski
|
9f104f2c8f
|
modif tpl product
|
2016-04-27 16:35:02 +02:00 |
|
Marion Muszynski
|
73a43c2042
|
modif tpl product
|
2016-04-27 16:24:35 +02:00 |
|
Marion Muszynski
|
2a160422d9
|
adding desc more for product
|
2016-04-27 16:11:19 +02:00 |
|
Marion Muszynski
|
20beed5ed7
|
modif css
|
2016-04-26 17:06:16 +02:00 |
|
Marion Muszynski
|
2217bf5414
|
modif tpl
|
2016-04-26 17:01:44 +02:00 |
|
Marion Muszynski
|
e85ce5fb93
|
modif next for thumb
|
2016-04-26 16:52:04 +02:00 |
|
Marion Muszynski
|
82a536aa5f
|
modif tpl
|
2016-04-26 16:43:28 +02:00 |
|
Marion Muszynski
|
5b40878629
|
modif tpl
|
2016-04-26 16:39:06 +02:00 |
|
Marion Muszynski
|
cbf6deeb91
|
begin new product tpl
|
2016-04-26 16:19:40 +02:00 |
|
Marion Muszynski
|
be4026ba1a
|
modif tpl
|
2016-04-25 12:45:13 +02:00 |
|
Marion Muszynski
|
cd742921f3
|
update tpl
|
2016-04-22 16:30:18 +02:00 |
|
Marion Muszynski
|
35ee4a1c68
|
many update of module loyalty
|
2016-04-21 17:41:04 +02:00 |
|
Marion Muszynski
|
15f3b6fa20
|
modif tpl
|
2016-04-21 12:01:10 +02:00 |
|
Marion Muszynski
|
c8befd1ede
|
total modification of loyalty module
|
2016-04-21 11:14:33 +02:00 |
|
Thibault UBUNTU
|
bbee57249a
|
version mobile
|
2016-04-20 17:35:03 +02:00 |
|
Marion Muszynski
|
21f1ada2d1
|
Merge branch 'ticket-landingpage'
|
2016-04-20 15:35:16 +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
|
848dbdedc0
|
load payment paypal
|
2016-04-20 14:20:07 +02:00 |
|
Marion Muszynski
|
0073cb8dde
|
fix css
|
2016-04-15 11:37:01 +02:00 |
|
Marion Muszynski
|
0b0ebcb26f
|
fix conflict consommables
|
2016-04-12 15:17:45 +02:00 |
|
Marion Muszynski
|
1d26459616
|
update landing page for connect button
|
2016-04-08 15:31:40 +02:00 |
|
Thibault UBUNTU
|
552b46347e
|
v0.1 paypal billing
|
2016-04-06 15:52:14 +02:00 |
|
Marion Muszynski
|
4309307488
|
modif script put in header.tpl
|
2016-04-05 16:18:52 +02:00 |
|
Marion Muszynski
|
f986fa77a6
|
ajout script crazyegg
|
2016-04-04 17:30:52 +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
|
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
|
56f1489fbc
|
petite trad
|
2016-03-31 12:08:39 +02:00 |
|
Srv Bebeboutik
|
c3c53223ca
|
remove ie6 info
|
2016-03-31 12:06:40 +02:00 |
|
Srv Bebeboutik
|
bcdb91f1e3
|
prepare ssl
|
2016-03-31 12:06:08 +02:00 |
|
Marion Muszynski
|
086f3f5906
|
add define
|
2016-03-16 17:56:03 +01:00 |
|
Marion Muszynski
|
de06f70738
|
check consommables
|
2016-03-16 15:24:12 +01:00 |
|
Thibault UBUNTU
|
4a6ce8b8c1
|
add delete delivery delay on shopping cart if no product
|
2016-03-09 16:44:00 +01:00 |
|
Thibault UBUNTU
|
66467587a9
|
add limit economy test
|
2016-03-07 16:02:27 +01:00 |
|
Srv Bebeboutik
|
f5e8d0d1dc
|
trad
|
2016-03-07 15:18:56 +01:00 |
|
Thibault UBUNTU
|
04052b1ce7
|
addreassurance text on es version
|
2016-03-07 13:01:56 +01:00 |
|
Thibault UBUNTU
|
f2b34f988a
|
modif logo footer
|
2016-03-07 11:03:22 +01:00 |
|
Thibault UBUNTU
|
2d660b2c2a
|
change img transporteur es
|
2016-03-02 11:14:09 +01:00 |
|
Srv Bebeboutik
|
20e38fa1be
|
fix trad ES box add to cart
|
2016-03-02 10:52:30 +01:00 |
|
Srv Bebeboutik
|
0918b1e26d
|
push prod
|
2016-02-24 16:23:27 +01:00 |
|
Marion Muszynski
|
58084aa3c7
|
adding module ant_support et ant_support_form
|
2016-02-19 15:30:29 +01:00 |
|
Srv Bebeboutik
|
241f738908
|
updateprod
|
2016-02-09 10:46:07 +01:00 |
|
Srv Bebeboutik
|
9fc55101c0
|
delete skinstatic from repo
|
2016-01-27 16:06:25 +01:00 |
|
Srv Bebeboutik
|
b6a00eea97
|
add delay 72h
|
2016-01-22 11:50:50 +01:00 |
|
Srv Bebeboutik
|
077e0eac0f
|
fix notice validation get in header
|
2016-01-11 10:18:01 +01:00 |
|
Srv Bebeboutik
|
8ce06e9584
|
change pixel facebook fr es
|
2016-01-11 10:10:48 +01:00 |
|
Srv Bebeboutik
|
883f095864
|
modif prod noel tpl + stats sale
|
2016-01-08 12:04:41 +01:00 |
|
Srv Bebeboutik
|
340bc7c146
|
push site
|
2016-01-04 12:48:08 +01:00 |
|