Commit Graph

530 Commits

Author SHA1 Message Date
Romuald
8da49f31bc maj coche dans le produit pour remonté produit 2016-12-02 11:38:22 +01:00
Romuald
4c915b7540 truncate plus petit 2016-12-02 10:15:50 +01:00
Romuald
7bc3a3e97a remonté edito home 2016-12-01 17:04:09 +01:00
Nolwenn
5d9de8c0bf fix conflict 2016-12-01 14:49:01 +01:00
Romuald
3ade87d0dc Merge branch 'ticket/r11833-hotjar' 2016-11-30 17:24:49 +01:00
Romuald
6bd31540fd fix conflict 2016-11-30 15:15:21 +01:00
Romuald
8cda4a1b8e Merge branch 'ticket/r11575-discrete_cookie' 2016-11-30 15:13:02 +01:00
Romuald
9d08b636ed border 2016-11-28 17:47:11 +01:00
Romuald
0d4edb6d0c correction listing produit sur la page produit 2016-11-28 16:08:46 +01:00
Romuald
8b26688243 correction display 2016-11-28 15:47:39 +01:00
Romuald
fe6888b368 fix display 2016-11-28 14:47:47 +01:00
Romuald
5054cdefc3 mise en place du tag 2016-11-25 12:02:27 +01:00
Nolwenn
393c82d622 ticket/r11575 - bandeau cookie 2016-11-24 12:01:02 +01:00
Nolwenn
3b8aeed6b0 ticket/r11766-avis_verifies 2016-11-23 15:52:30 +01:00
ToutPratique
5cec889295 remove conflict 2016-11-22 10:13:35 +01:00
ToutPratique
a69c24d289 trad 2016-11-21 10:29:07 +01:00
Thibault UBUNTU
d3fd5c8f0d push refonte panier 2016-11-17 10:17:12 +01:00
Nolwenn
868b7694da ticket 10780 / fancybox - modal du refonte cart avec infos produit 2016-11-16 15:56:25 +01:00
Nolwenn
6080ae3eec structure fancybox 2016-11-16 12:38:04 +01:00
Nolwenn
e06492bdb1 fix modal responsive bis 2016-11-16 10:54:13 +01:00
Nolwenn
01b721d675 fix responsive modal 2016-11-16 10:33:21 +01:00
Nolwenn
af596e4773 ticket 10780 / suite modal produit crosselling 2016-11-15 16:32:00 +01:00
Nolwenn
07c6aea7ab modal produit crosseling 2016-11-15 16:09:36 +01:00
Nolwenn
6b97a6cfd5 ticket 10780 / phrase antadis_crosselling et reload bon shipping ajax 2016-11-15 10:22:15 +01:00
Nolwenn
9839672763 ticket 10780 / refonte panier 2016-11-14 12:47:21 +01:00
Nolwenn
dd6321e847 Merge branch 'shoping-cart_refonte' of gitlab.antadis.net:dev-antadis/toutpratique into shoping-cart_refonte 2016-11-10 15:27:49 +01:00
Nolwenn
4f65615dfb checkout correctif 2016-11-10 15:27:19 +01:00
Thibault UBUNTU
14cd607621 trad 2016-11-10 10:43:12 +01:00
Nolwenn
fa6049199d Merge branch 'shoping-cart_refonte' of gitlab.antadis.net:dev-antadis/toutpratique into shoping-cart_refonte 2016-11-09 13:03:15 +01:00
Thibault UBUNTU
f6c16fe8ee module cross selling 2016-11-09 12:58:06 +01:00
Nolwenn
6ebf7d91a3 ticket 11111/ modif guest checkout 2016-11-09 11:15:59 +01:00
Denis Baudot
efe67d78a9 start the cross selling module 2016-11-08 18:01:25 +01:00
ToutPratique
4a81406a50 fix error js 2016-11-03 14:30:26 +01:00
Thibault UBUNTU
604df7b90b apply astuce small screen 2016-11-03 11:43:01 +01:00
Thibault UBUNTU
cfc374ec2a fix search css 2016-11-03 11:37:02 +01:00
Thibault UBUNTU
85f89fcdb4 fix doofinder 2016-11-02 15:03:28 +01:00
Nolwenn
f091d0a40a suite recup doofinder + fix responsive 2016-11-02 14:34:33 +01:00
Nolwenn
e20f6194ff add blocksearch 2016-11-02 14:17:05 +01:00
Nolwenn
f9324c2b9a add variable header 2016-11-02 14:03:57 +01:00
Nolwenn
7bfa521ee4 add modif doofinder 2016-11-02 13:39:31 +01:00
Nolwenn
9b91cad0fa add modif 2016-11-02 11:04:30 +01:00
Nolwenn
2920ba2bc7 traduction 2016-10-13 17:24:34 +02:00
Nolwenn
7963fd9c76 guest tracking 2016-10-13 16:39:21 +02:00
Nolwenn
4e56b5b618 adjust checkout 2016-10-13 13:40:08 +02:00
Nolwenn
a2ac07f284 order checkout 2016-10-13 12:44:40 +02:00
Nolwenn
b7a58d4293 add product list blocs 2016-10-12 18:06:52 +02:00
Nolwenn
62f033808e adjust suite 2016-10-12 17:47:32 +02:00
Nolwenn
f4832b79a7 adjust suite 2016-10-12 17:41:22 +02:00
Nolwenn
b2b0afc8cd adjust suite 2016-10-12 17:30:29 +02:00
Nolwenn
d0ba84c9ba adjust suite 2016-10-12 17:21:56 +02:00
Nolwenn
abe6c5b3ab reajust resp 2016-10-12 17:09:35 +02:00
Nolwenn
d6b190c430 ajust responsive 2 2016-10-12 17:03:20 +02:00
Nolwenn
6080442b61 adjust resposnive 2016-10-12 16:53:06 +02:00
Nolwenn
1a0ef77786 fix responsive ticket 2016-10-12 16:01:45 +02:00
Nolwenn
aa73a19da5 shoping-cart_refonte suite (autre page du tunnel) sauf pages payments 2016-10-10 18:25:25 +02:00
Nolwenn
a2c448459d shopping cart 2016-10-10 17:42:23 +02:00
Alexandre Simonet
0f9eb3ab11 #11015 flux rss 2016-10-04 10:34:18 +02:00
ToutPratique
49e4ac2976 fix buggy display of mondial relay selection 2016-09-27 13:33:45 +02:00
Rodney Figaro
8058a1f21d suppress delivery price specific to product with a weight inferior than 350g 2016-09-23 17:50:59 +02:00
Rodney Figaro
101d67192c change delivery prices 2016-09-23 17:46:06 +02:00
ToutPratique
10f84c1d79 trad 2016-09-23 16:07:57 +02:00
ToutPratique
843ff149e2 Merge branch 'fix-mondialrelay' 2016-09-07 11:58:59 +02:00
ToutPratique
033d3875e9 push prod 2016-09-07 11:58:15 +02:00
Rodney Figaro
ea51d7168e add warning if no delivery choiced and remove default selection 2016-09-07 10:53:31 +02:00
Rodney Figaro
792a0095c1 fix changing delivery address 2016-09-06 16:57:51 +02:00
Rodney Figaro
168b837f21 fix display delivery choice in order validation (front) 2016-09-01 18:05:44 +02:00
ToutPratique
9e3d2b2d3f fix bug product-list sur la page cms 2016-08-10 14:48:12 +02:00
Romuald
ed73323b56 trad 2016-08-09 16:01:39 +02:00
Romuald
ad1c65c8e2 cookieinfo 2016-08-09 15:52:19 +02:00
ToutPratique
b980531603 fix css 2016-08-09 15:12:58 +02:00
ToutPratique
459feef2b9 fix checkbox 2016-08-05 10:35:11 +02:00
ToutPratique
81c7a802d5 fix css 2016-08-05 10:09:07 +02:00
Romuald
a1571da316 cleanage de l'affichage 2016-08-05 09:55:05 +02:00
Romuald
2dd79ea1f3 Merge branch 'product_sauv_stack' 2016-08-05 09:46:07 +02:00
Romuald
fc5da8e291 fix add to cart manquant du panier 2016-08-04 10:14:04 +02:00
Nolwenn
3437d3c3cd fix container 2016-08-03 13:13:45 +02:00
Nolwenn
facf0f41ef fix prod qui sauv stacké 2016-08-03 12:26:39 +02:00
Nolwenn
70eb4d798f branch pro stack 2016-08-03 12:13:14 +02:00
ToutPratique
e03f45136e push prod 2016-08-02 10:22:32 +02:00
ToutPratique
6f14682a50 Merge branch 'master' of gitlab.antadis.fr:dev-antadis/toutpratique 2016-07-20 12:12:36 +02:00
Romuald
0b0836f802 correction ajax-cart 2016-07-20 12:08:56 +02:00
ToutPratique
f89176570d modif prod 2016-07-20 12:07:50 +02:00
Romuald
d8ffd30f2a conflict encore 2016-07-20 11:23:44 +02:00
Romuald
259d98f972 conflict 2016-07-20 11:20:33 +02:00
ToutPratique
95fa1dcd26 fix conflict 2016-07-20 10:22:33 +02:00
Romuald
6ca84bd2e0 fix isset 2016-07-20 10:14:12 +02:00
Thibault UBUNTU
38b030cf62 fix 2016-07-13 10:18:58 +02:00
Thibault UBUNTU
8da17832ae fix 2016-07-13 10:08:39 +02:00
Thibault UBUNTU
11801fa521 fix 2016-07-13 10:05:49 +02:00
Thibault UBUNTU
ed30614aac fix 2016-07-13 09:59:38 +02:00
Thibault UBUNTU
463c3bbd93 fix conflit 2016-07-13 09:51:51 +02:00
Nolwenn
083073299a espacement reassurance 2016-07-11 17:42:32 +02:00
Nolwenn
c12f3e6758 fix reassurance 2016-07-11 17:33:10 +02:00
Nolwenn
72943778ea fomeshop fix reassurance 2016-07-11 17:06:50 +02:00
Nolwenn
653ce93af9 fix homeShop 2016-07-11 16:51:27 +02:00
Nolwenn
95bae71726 fleches slider bis 2016-07-11 12:44:52 +02:00
Nolwenn
7d1eef87d9 change place blockmanu 2016-07-11 12:25:10 +02:00
Nolwenn
f81842bc4e homestore 2016-07-11 12:08:49 +02:00
Nolwenn
4ceb3e9753 blocklayered 2016-07-08 16:44:03 +02:00
Nolwenn
571cb44865 responsive listing com maquette 2016-07-07 18:21:03 +02:00
Nolwenn
981afa10be fix row 2016-07-07 17:16:27 +02:00
Nolwenn
dd273586bb homemag suite 2016-07-07 17:00:49 +02:00
Nolwenn
a39cac18df fix btn 2016-07-07 16:18:18 +02:00
Nolwenn
15772dca67 fix marge no product 2016-07-07 16:15:15 +02:00
Nolwenn
606fc4a64c blocklayered fix 2 2016-07-07 16:09:40 +02:00
Nolwenn
5e9e4d9824 fix blocklayered 2016-07-07 16:00:56 +02:00
Nolwenn
d44345340a best sellers fix 2016-07-07 15:27:36 +02:00
Nolwenn
fd6dabc7a3 marge 2016-07-07 15:19:34 +02:00
Nolwenn
5f9438f54e prodaccessories fin 2016-07-06 17:35:11 +02:00
Nolwenn
1485ed9d16 module prod accessories 2016-07-06 17:23:42 +02:00
Nolwenn
bf7750114b product-list fix 2016-07-06 15:44:29 +02:00
Nolwenn
948540b2e8 product accessories suite 2016-07-06 13:30:49 +02:00
ToutPratique
8851a4b44f Merge branch 'master' of gitlab.antadis.fr:dev-antadis/toutpratique 2016-07-06 12:25:45 +02:00
ToutPratique
3cbd9fad08 push prod 2016-07-06 12:25:40 +02:00
Thibault UBUNTU
cb25758a2d Merge branch 'reassurance' 2016-07-06 12:00:52 +02:00
Nolwenn
04693d8b49 product accessories placement 2016-07-06 11:22:58 +02:00
Nolwenn
1b0f235bb1 product accessories placement 2016-07-06 11:21:41 +02:00
Nolwenn
61580c0411 fix product reassurance suite 2016-07-04 13:34:58 +02:00
Nolwenn
4382efb269 fix reassurance product 2016-07-04 13:33:00 +02:00
Nolwenn
31b16d492c fix listing 2016-07-04 13:25:11 +02:00
Nolwenn
71fb3e1097 fix listing best seller 2016-07-01 15:45:49 +02:00
Thibault UBUNTU
d36eea470c push gitignore 2016-07-01 14:39:37 +02:00
Thibault UBUNTU
900e7efa2b Merge branch 'product' 2016-07-01 13:00:12 +02:00
Nolwenn
fca3c47d0f fix offset line total shipping 2016-07-01 12:53:33 +02:00
Nolwenn
53e3dcdb96 fix reassurance page produit 2016-07-01 12:12:27 +02:00
Thibault UBUNTU
b77eb6d497 Merge branch 'product' 2016-07-01 10:59:31 +02:00
Nolwenn
e2abecf179 fix 2xold price* 2016-07-01 10:42:36 +02:00
Thibault UBUNTU
748edf68cf Merge branch 'lightbox' 2016-07-01 10:22:29 +02:00
Thibault UBUNTU
22e5b24c72 fix conflit 2016-07-01 10:22:24 +02:00
ToutPratique
2ddb6f75b6 push prod 2016-07-01 10:13:25 +02:00
Nolwenn
c3102e15eb listing 2016-06-27 13:28:11 +02:00
ToutPratique
2e3e4f1e04 hotfix css 2016-06-23 12:33:14 +02:00
Thibault UBUNTU
9b8543841f fix conflict 2016-06-23 12:24:35 +02:00
ToutPratique
27d5228ae2 fix 2016-06-23 12:16:22 +02:00
ToutPratique
ca59f9d3de Merge branch 'master' of gitlab.antadis.fr:dev-antadis/toutpratique 2016-06-23 11:44:40 +02:00
Thibault UBUNTU
2440ed6fd2 Merge branch 'menu' 2016-06-23 11:31:32 +02:00
Romuald
313890065f fix ajax menu event 2016-06-23 11:17:27 +02:00
ToutPratique
731a03a487 push prod 2016-06-23 10:23:03 +02:00
Nolwenn
395eac04f4 ajouts homeshop 2016-06-23 10:07:40 +02:00
Nolwenn
2b02823a2c home mag 2016-06-22 16:12:58 +02:00
Nolwenn
9cd5a7a665 shop home 2016-06-22 14:44:42 +02:00
Nolwenn
5ed6d0efe9 listing 2016-06-22 10:59:17 +02:00
Nolwenn
07073cdbd0 listing suite 2016-06-22 10:37:14 +02:00
Nolwenn
fb9642077f listing 2016-06-21 18:43:53 +02:00
Nolwenn
bbe314fa4a fix manufacturer2 2016-06-15 10:47:46 +02:00
Nolwenn
d0951fd315 fix manufacturer 2016-06-15 10:44:40 +02:00
Nolwenn
eada1ce38d menu ios 2016-06-14 14:49:17 +02:00
Nolwenn
c4ef51a7ef header 2016-06-14 14:28:52 +02:00
Nolwenn
4412e657b8 promo menu 2016-06-14 13:10:03 +02:00
Nolwenn
cf010a6145 listing fix picto 2016-06-14 12:58:40 +02:00
Nolwenn
d4b45debcd fix listing 2016-06-14 12:54:33 +02:00
Nolwenn
23151dc501 product fix pictos 2016-06-14 12:17:26 +02:00
Nolwenn
d919e4c61b listing correctifs 2016-06-14 12:13:21 +02:00
Nolwenn
7e029cc2dc ajout picto listing 2016-06-14 12:01:16 +02:00
Nolwenn
f12869e4d5 fix conflict 2016-06-14 11:32:45 +02:00
Nolwenn
30b56b0956 header 2016-06-14 11:30:08 +02:00
Nolwenn
04bad064e0 product-list 2016-06-14 10:59:08 +02:00
Nolwenn
65f6b86fa9 listing 2016-06-13 18:40:44 +02:00
Romuald
7703db4bf1 last child menu 2016-06-10 17:35:39 +02:00
Nolwenn
30fbc7b514 fix bloc manufacturer 2016-06-10 17:27:32 +02:00
Nolwenn
2836a11907 listing 2016-06-10 17:24:02 +02:00
Nolwenn
becde87c83 reajust print 2016-06-10 14:29:30 +02:00
Nolwenn
9f6cd0a602 product 2016-06-10 13:33:15 +02:00
Nolwenn
5ce2f20025 shopping cart 2016-06-10 13:09:02 +02:00
Romuald
71c94a2fca fix menu tab 2016-06-10 12:58:31 +02:00
Nolwenn
88e933931a typo 2016-06-10 12:01:26 +02:00
Nolwenn
54031b7931 fix header 2 2016-06-10 11:40:03 +02:00
Nolwenn
e90a470b76 fix header 2016-06-10 11:38:23 +02:00
Romuald
51c84be1d3 passage sur 3 colonnes 2016-06-10 10:33:34 +02:00
Nolwenn
1c879610e5 bloc manufacturer 2016-06-10 10:32:22 +02:00
Nolwenn
4ddae669f3 panier 2016-06-09 18:31:09 +02:00
Nolwenn
f596b9fa15 remove old reassurance 2016-06-09 16:01:17 +02:00
Nolwenn
41bd32f393 logo 2016-06-09 10:14:56 +02:00
Nolwenn
af3cb4737b lightbox 2016-06-09 10:10:21 +02:00
Nolwenn
1b1830932d header 2016-06-09 09:55:38 +02:00
Nolwenn
2599cb5eeb block manufacturer 2016-06-08 17:36:29 +02:00
Nolwenn
5a27c87b0e reassurance 2016-06-08 17:11:44 +02:00
Romuald
644588c281 fix js desktop 2016-06-02 12:53:12 +02:00
Romuald
86c263ec6d fix js desktop 2016-06-02 12:44:46 +02:00
Romuald
05939b6f0e menu 2016-06-02 12:35:53 +02:00
ToutPratique
1d1a2def5f push prod 2016-05-17 15:54:37 +02:00
Nolwenn
762d0d024f net reviews 2016-03-18 17:52:31 +01:00
Nolwenn
96ae4ed3bc skin net reviews2 2016-03-18 10:02:12 +01:00
Nolwenn
b88feb16ec Merge branch 'master' of gitlab.antadis.fr:dev-antadis/toutpratique 2016-03-18 09:59:19 +01:00
Nolwenn
6bad5f812a skin net reviews 2016-03-18 09:58:53 +01:00
ToutPratique
f23c51f56c Merge branch 'master' of gitlab.antadis.fr:dev-antadis/toutpratique 2016-03-16 12:10:33 +01:00
ToutPratique
ea8df5636d push prod 2016-03-16 12:09:00 +01:00
Nolwenn
3d3c91838d display price free shipping 2016-02-18 09:38:39 +01:00
Nolwenn
dba29bacf1 calcul shopping cart 2016-02-17 12:41:48 +01:00
Nolwenn
786bbdbd76 modif ligne shopping cart 2016-02-16 18:07:13 +01:00
Nolwenn
d20156ee34 calcul panier 2016-02-16 09:55:59 +01:00
Nolwenn
2f5f8f96b3 ligne panier 2016-02-15 17:44:58 +01:00
Nolwenn
7fc0260bfe panier et produits qui sauvent la vie 2016-02-15 17:38:17 +01:00
Nolwenn
8871bbe001 bouton continuer mes achats 2016-02-15 15:56:50 +01:00
Nolwenn
4afc15cdab différence à atteindre pour livraiuson gratuite 2016-02-15 15:47:37 +01:00
Nolwenn
2ac9412b3f hook category cms 2016-02-15 15:41:08 +01:00
ToutPratique
e670c7b7ca update git 2016-02-09 11:09:13 +01:00
ToutPratique
1164410df3 update git 2016-02-09 10:18:17 +01:00
Thibault UBUNTU
5975ee6e07 fix height 2016-01-13 10:40:14 +01:00
Thibault UBUNTU
95355127fa fix hauteur astuce on mobile 2016-01-13 10:36:42 +01:00