Commit Graph

514 Commits

Author SHA1 Message Date
Michael RICOIS
b24091f295 Merge remote-tracking branch 'origin/ticket/r13721-mobile-inscription' 2017-07-27 16:22:06 +02:00
Michael RICOIS
ddbbaa9669 Remove debug 2017-07-27 16:20:59 +02:00
Michael RICOIS
fa6bcaf660 Fix Mobile Detect 2017-07-27 16:15:46 +02:00
Michael RICOIS
cbbd5de2f6 Detect provenance campagne email
Si mobile et user notLogged reidirige vers la page inscription
2017-07-27 15:49:14 +02:00
Michael RICOIS
bb97c4685f Nettoyage 2017-07-27 15:48:11 +02:00
Michael
1a3d4e4316 Merge branch 'ticket/r13612-logo-cadre' into 'master'
Fix affichage du div lorsque pas de logo

See merge request !2
2017-07-27 11:27:08 +02:00
Michael RICOIS
35f256077d Merge remote-tracking branch 'origin/ticket/r13721-mobile-inscription' into dev 2017-07-26 16:56:03 +02:00
Michael RICOIS
0d662aa3c3 Redirection vers page ventes-privees?create_account=1 2017-07-26 16:52:42 +02:00
Michael RICOIS
b15c7265df CS 2017-07-26 12:57:53 +02:00
Michael RICOIS
311d8c8fd2 Merge remote-tracking branch 'origin/ticket/r13612-logo-cadre' into dev 2017-07-26 11:17:39 +02:00
Michael RICOIS
c677052972 Fix affichage du div lorsque pas de logo sur la catégorie de la vente
privée
2017-07-26 11:15:34 +02:00
Srv Privilege de marque
c90afca56b traduction 2017-07-03 15:11:21 +02:00
Srv Privilege de marque
c63ff9c529 remove text 2017-07-03 15:11:06 +02:00
Rodney Figaro
b9e356da5d 13031 - add colissimo web service, remove chronopost 2017-06-13 16:32:26 +02:00
Rodney Figaro
effb14e2a2 Merge branch 'ticket/r13453-export-bdc' into dev 2017-06-12 17:35:09 +02:00
Rodney Figaro
fd851e7649 13453 - remove column "ID attribut" in private sales BDC export 2017-06-12 17:34:47 +02:00
Rodney Figaro
c4b362149f Merge branch 'ticket/r13444-new-columns-BO-products-fix' into dev 2017-06-12 11:54:53 +02:00
Rodney Figaro
052ec16055 13444 - fix product controller sql request with filters 2017-06-12 11:54:41 +02:00
Rodney Figaro
1a57051b50 Merge branch 'ticket/r13444-new-columns-BO-products-fix' into dev 2017-06-12 11:43:21 +02:00
Rodney Figaro
0f396019f4 Revert "Revert "13444 - add 3 columns in admin products list""
This reverts commit cbf3c937ac.
2017-06-12 11:42:50 +02:00
Rodney Figaro
978fd17d31 Merge branch 'ticket/r13031-socolissimo' into dev 2017-06-12 11:39:37 +02:00
Rodney Figaro
92765e56fe Merge branch 'master' into dev 2017-06-12 11:39:15 +02:00
Srv Privilege de marque
cbf3c937ac Revert "13444 - add 3 columns in admin products list"
This reverts commit b31a3f9c88.
2017-06-12 11:32:48 +02:00
Rodney Figaro
b67527da24 Merge branch 'ticket/r13444-new-columns-BO-products' into dev 2017-06-12 11:06:09 +02:00
Rodney Figaro
b31a3f9c88 13444 - add 3 columns in admin products list 2017-06-12 11:05:59 +02:00
Srv Privilege de marque
ee81a9327c 13031 - remove module chronopost 2017-06-12 09:20:27 +02:00
Srv Privilege de marque
37489f6426 13031 - adapt socolissmo fancy tpl js 2017-06-09 18:07:30 +02:00
Rodney Figaro
30deec0f7f 13031 - add socolissimo 2017-06-09 11:35:43 +02:00
Rodney Figaro
7bf2c05735 Merge branch 'ticket/r13443-carrier-title-mobile' into dev 2017-06-08 18:31:04 +02:00
Rodney Figaro
23d3fc1cd2 13443 - reduce carrier logo in mobile 2017-06-08 18:30:54 +02:00
Rodney Figaro
42b6e2a4ca Merge branch 'ticket/r13443-carrier-title-mobile' into dev 2017-06-08 18:22:53 +02:00
Rodney Figaro
bc4bf33b79 13443 - show carrier title in mobile 2017-06-08 18:22:29 +02:00
Rodney Figaro
2b9e60250b Merge branch 'ticket/r13449-bug-slider' into dev 2017-06-08 17:07:23 +02:00
Rodney Figaro
0c9aed139f 13449 - sale cache : take account of sales shown and is mobile 2017-06-08 17:07:12 +02:00
Rodney Figaro
16caaa2065 Merge branch 'ticket/r13449-bug-slider' into dev 2017-06-08 15:59:57 +02:00
Rodney Figaro
fe94137bfd 13449 - home page cache : take account of slider dates 2017-06-08 15:58:54 +02:00
Rodney Figaro
7ed3d7f259 13449 - clear home cache when saving private sales preferences 2017-06-08 12:57:48 +02:00
Rodney Figaro
877b7f269e Merge branch 'ticket/r13441-remove-continue-delivery' into dev 2017-06-07 17:25:18 +02:00
Rodney Figaro
36c2a57b50 13441 - remove "continue shopping" button in carrier page 2017-06-07 17:25:05 +02:00
Rodney Figaro
86f3a469eb Merge branch 'master' into dev 2017-06-07 16:26:54 +02:00
Srv Privilege de marque
2988698bc6 13407 - show idproduct instead of reference product 2017-06-07 14:07:54 +02:00
Rodney Figaro
998b7e0c86 Merge branch 'master' into dev 2017-06-02 17:30:08 +02:00
Rodney Figaro
317963b115 13407 - hide product reference 2017-06-02 17:29:29 +02:00
Rodney Figaro
e9b8c16ec5 fix sale cache 2017-06-02 17:25:41 +02:00
Rodney Figaro
56aa287169 fix undefined HTTP_REFERER 2017-05-31 16:57:46 +02:00
Srv Privilege de marque
365a6a9598 save translations 2017-05-31 16:46:41 +02:00
Srv Privilege de marque
552a0ea848 12613 - update img in theme 2017-05-31 16:45:14 +02:00
Srv Privilege de marque
1d15109dca save cartsguru module 2017-05-31 16:44:07 +02:00
Srv Privilege de marque
a196359377 13390 - fix js async bug 2017-05-31 16:43:35 +02:00
Rodney Figaro
e72f7962f1 13388 - fix bug config Cartguru 2017-05-31 16:20:44 +02:00