Commit Graph

216 Commits

Author SHA1 Message Date
Michael RICOIS
731db1fe28 Merge branch 'ticket/r13031-colissimo-webservice' into dev 2017-09-27 14:49:36 +02:00
Michael RICOIS
8b4764918a Solve conflit with soflexibilite 2017-09-27 14:44:25 +02:00
Michael RICOIS
28f6685178 Unknown function 2017-09-27 12:29:03 +02:00
Michael RICOIS
db99007cc5 Merge remote-tracking branch 'origin/ticket/r13883-exportnewsletterpro' into dev 2017-09-18 09:50:49 +02:00
Michael RICOIS
6a95ebf079 Fix 2017-09-15 14:39:32 +02:00
Michael RICOIS
c2aa690c7f Merge remote-tracking branch 'origin/ticket/r13883-exportnewsletterpro' into dev 2017-09-14 11:46:59 +02:00
Michael RICOIS
a2a082a8cf Encore un changement de version 2017-09-14 11:45:05 +02:00
Michael RICOIS
5ae19736bc Merge remote-tracking branch 'origin/ticket/r13883-exportnewsletterpro' into dev 2017-09-13 10:09:40 +02:00
Michael RICOIS
a0c25961ff Merge remote-tracking branch 'origin/ticket/r13756-slider' into dev 2017-09-13 10:09:31 +02:00
Michael RICOIS
85afc9e8da Lifetime 2017-09-13 10:09:09 +02:00
Michael RICOIS
07e0e7d18a Changement config des newsletters - again 2017-09-13 10:07:50 +02:00
Michael RICOIS
59c27258cd Merge remote-tracking branch 'origin/ticket/r13756-slider' into dev 2017-09-07 14:45:03 +02:00
Michael RICOIS
95320c6e84 Remove slider cache 2017-09-07 14:42:36 +02:00
Michael RICOIS
183cc2e57d Merge branch 'ticket/r13756-slider' into dev 2017-09-05 10:01:39 +02:00
Michael RICOIS
4e86171ada Better group selection 2017-09-05 10:00:59 +02:00
Michael RICOIS
aeaf1786fc Merge branch 'ticket/r13883-exportnewsletterpro' into dev 2017-09-04 16:44:57 +02:00
Michael RICOIS
d4e60bacee Template newsletter 2017-09-04 16:44:30 +02:00
Michael RICOIS
42b9247f65 Fix before merge 2017-08-30 10:29:43 +02:00
Michael RICOIS
d69f753f9c Merge remote-tracking branch 'origin/ticket/r13883-exportnewsletterpro' into dev 2017-08-30 10:14:59 +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
f62d1d511f Merge remote-tracking branch 'origin/ticket/r13756-slider' into dev 2017-08-28 16:33:18 +02:00
Michael RICOIS
4248ceb595 Default group 2017-08-28 16:32:01 +02:00
Michael RICOIS
17d47b4257 Revert "Typo"
This reverts commit dac5f94620.
2017-08-28 16:31:10 +02:00
Michael RICOIS
eef9c88cf0 Revert "Default group"
This reverts commit 384015bc6b.
2017-08-28 16:31:07 +02:00
Michael RICOIS
384015bc6b Default group 2017-08-28 16:29:23 +02:00
Michael RICOIS
dac5f94620 Typo 2017-08-28 15:50:33 +02:00
Michael RICOIS
ba61fd87ab Merge remote-tracking branch 'origin/ticket/r13756-slider' into dev 2017-08-28 14:52:21 +02:00
Michael RICOIS
ea75b02efa Image name 2017-08-28 14:48:31 +02:00
Michael RICOIS
fcf69fedec Img path and description 2017-08-28 12:32:45 +02:00
Michael RICOIS
8d7ccb4d3f Change cache path and get configuration variable to not use cache 2017-08-28 12:32:07 +02:00
Michael RICOIS
ad77e3ce49 Drop table 2017-08-28 11:23:02 +02:00
Michael RICOIS
5d7980ca13 Merge remote-tracking branch 'origin/ticket/r13883-exportnewsletterpro' into dev 2017-08-28 10:31:34 +02:00
Michael RICOIS
368d82307c Display slider in front 2017-08-28 10:25:22 +02:00
Michael RICOIS
41f45d1404 AdvSlider avec prise en compte des dates et des groupes utilisateurs 2017-08-25 17:34:59 +02:00
Michael RICOIS
f7857a3f40 SQL param protect type 2017-08-25 10:54:11 +02:00
Michael RICOIS
e54b05cd03 Add module advslider 2017-08-25 10:42:18 +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
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
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
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
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
e9b8c16ec5 fix sale cache 2017-06-02 17:25:41 +02:00