Commit Graph

437 Commits

Author SHA1 Message Date
Michael RICOIS
a2a082a8cf Encore un changement de version 2017-09-14 11:45:05 +02:00
Michael RICOIS
07e0e7d18a Changement config des newsletters - again 2017-09-13 10:07:50 +02:00
Michael RICOIS
d4e60bacee Template newsletter 2017-09-04 16:44:30 +02:00
Michael RICOIS
ab3695e7a8 Rename export 2017-08-30 10:14:24 +02:00
Michael RICOIS
747b957f98 Rename submit bouton 2017-08-30 09:34:29 +02:00
Michael RICOIS
f7857a3f40 SQL param protect type 2017-08-25 10:54:11 +02:00
Michael RICOIS
8c40caedf8 Add newsletter export group pro and theme v5 2017-08-24 17:41:04 +02:00
Srv Privilege de marque
719b0aa743 Merge branch 'master' of gitlab.antadis.net:dev-antadis/privilegedemarque 2017-08-02 10:58:15 +02:00
Srv Privilege de marque
ed3db565e6 fix mailjet sync 2017-08-02 10:57:59 +02:00
Srv Privilege de marque
2df8a54ba9 update memory limit 2017-08-02 10:57:47 +02:00
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
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
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
fd851e7649 13453 - remove column "ID attribut" in private sales BDC export 2017-06-12 17:34:47 +02:00
Rodney Figaro
052ec16055 13444 - fix product controller sql request with filters 2017-06-12 11:54:41 +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
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
b31a3f9c88 13444 - add 3 columns in admin products list 2017-06-12 11:05:59 +02:00
Rodney Figaro
23d3fc1cd2 13443 - reduce carrier logo in mobile 2017-06-08 18:30:54 +02:00
Rodney Figaro
bc4bf33b79 13443 - show carrier title in mobile 2017-06-08 18:22:29 +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
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
36c2a57b50 13441 - remove "continue shopping" button in carrier page 2017-06-07 17:25:05 +02:00
Srv Privilege de marque
2988698bc6 13407 - show idproduct instead of reference product 2017-06-07 14:07:54 +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
Srv Privilege de marque
07f5841490 13388 - add cartsguru define 2017-05-31 15:50:01 +02:00
Rodney Figaro
a11116d493 13387 - fix cache with connected customer with groups 2017-05-31 15:04:39 +02:00
Srv Privilege de marque
8fc90b3f7e add optimisation in theme/img, in js, fix clearcache in privatesales 2017-05-31 14:49:06 +02:00
Rodney Figaro
b5ecc2fff3 Merge branch 'ticket/r12613-optimisation-perfs' 2017-05-31 11:42:37 +02:00
Rodney Figaro
c35cc6824a 12613 - load ant_popover.js, fastclick.js and ganalytics.js async 2017-05-31 11:14:50 +02:00
Rodney Figaro
164deae8d5 Merge branch 'ticket/r13330-2-default-group-importcsv' 2017-05-30 17:03:57 +02:00
Rodney Figaro
fae7dc65a7 13330 - add 2 new default group when adding new category (in Category object) 2017-05-30 17:03:31 +02:00
Rodney Figaro
aac5a862b4 12613 - fs cache private sales home and homecat 2017-05-30 15:54:01 +02:00
Rodney Figaro
edc744f5d5 fix warnings in private sales home (in "Démarque en vrac") 2017-05-29 17:37:53 +02:00