113 Commits

Author SHA1 Message Date
PLESK5
87d5d801db Merge remote-tracking branch 'origin/fix/10666' 2016-08-26 11:45:02 +02:00
PLESK5
0f7987e7df Merge remote-tracking branch 'origin/fix/10666' into devel 2016-08-26 11:44:15 +02:00
Christophe Latour
91373a66c8 #10666 bis
https://tickets.antadis.net/issues/10666#note-3
2016-08-26 11:43:03 +02:00
PLESK5
dc36a7b43a Merge remote-tracking branch 'origin/devel' 2016-08-26 10:43:11 +02:00
Christophe Latour
475ab48035 Avoid check user 2016-08-26 10:42:38 +02:00
Christophe Latour
90110a7a6b Remove yieldify module 2016-08-26 10:41:51 +02:00
PLESK5
9a716a7176 Merge branch 'devel' 2016-08-25 12:09:10 +02:00
Christophe Latour
75c00b4ec7 Avoid check user 2016-08-24 15:53:56 +02:00
Christophe Latour
f6a4fa7e57 disable settings 2016-08-24 15:53:44 +02:00
Christophe Latour
53dec5cbf1 Yieldify to ant_popover 2016-08-24 15:46:06 +02:00
Christophe Latour
c45753cde6 #10351
Ajout du bandeau (Vente bientot terminé) en bas à droite de la cellule de la vente privé
2016-08-24 11:52:43 +02:00
Christophe Latour
ec257903ef export newsletter v4 2016-08-24 11:44:38 +02:00
PLESK5
69180b6f64 cleeaning git 2016-08-24 11:02:21 +02:00
PLESK5
2f8c863431 cleaning git 2016-08-24 10:58:43 +02:00
PLESK5
5823b74be7 Merge remote-tracking branch 'origin/master' 2016-08-23 18:31:09 +02:00
Christophe Latour
2d813e4fa2 reset head (Annulation du merge avec #10351) 2016-08-23 18:25:43 +02:00
Christophe Latour
2a79798eb8 #10351
Affichage d'un picto en bas à droite de la cellule de la vente privée.
2016-08-23 18:19:31 +02:00
Christophe Latour
2ca34400f7 #10666
Remove modules/ant_export_privatesales_newsletter/ from ignored git files.
2016-08-23 15:02:52 +02:00
PLESK5
4bb4b59ecf mails 2016-08-19 10:25:10 +02:00
PLESK5
541e20ab2a new slider images 2016-08-19 10:25:09 +02:00
PLESK5
751d9b94c1 new images 2016-08-19 10:25:09 +02:00
PLESK5
17eb3122ba mail modif 2016-08-19 10:25:07 +02:00
Christophe Latour
97da7a0bb3 Merge branch 'fix/exportStats' 2016-08-19 10:22:25 +02:00
Christophe Latour
53c6756256 fix 2016-08-17 16:11:23 +02:00
PLESK5
f3493f7848 translation 2016-08-17 13:08:46 +02:00
PLESK5
9472331dcd chmod 664 2016-08-17 13:08:46 +02:00
PLESK5
68820a5acf remove privatesale img from ingore files 2016-08-17 13:08:46 +02:00
PLESK5
ce251f421f chang image slider 2016-08-17 13:08:46 +02:00
Christophe Latour
d7141e167a chang style header text 2016-08-17 13:02:37 +02:00
PLESK5
7c63ed62e2 adding privateslae img 2016-08-16 15:45:06 +02:00
PLESK5
bb3f5300ef remove useless file 2016-08-16 15:41:47 +02:00
PLESK5
457850a138 remove useless file 2016-08-16 15:41:47 +02:00
PLESK5
45a575ff4e testProducts 2016-08-16 15:41:46 +02:00
PLESK5
3f4ce1821d yieldify 2016-08-16 15:41:46 +02:00
PLESK5
dad8aecefb exctract_spec 2016-08-16 15:41:46 +02:00
Christophe Latour
a433c66c85 adding antadis ip to dev ips 2016-08-16 15:41:35 +02:00
PLESK5
28aa3b9ca3 .gitignore 2016-08-16 14:35:24 +02:00
PLESK5
18dfb3fed4 remove from git 2016-08-16 14:34:09 +02:00
PLESK5
5e45a5905e tpl + css 2016-08-16 14:33:04 +02:00
PLESK5
b3cac46081 override 2016-08-16 14:32:14 +02:00
PLESK5
f479f659db rm useless file from git 2016-08-16 14:31:29 +02:00
PLESK5
59069e2103 remove useless file from git 2016-08-16 14:29:53 +02:00
PLESK5
0ff4afccc0 mails 2016-08-16 14:28:25 +02:00
PLESK5
aa45a7ba49 modif mail 2016-08-16 14:22:33 +02:00
PLESK5
7bcbc84313 mail follow up modified 2016-08-16 14:20:09 +02:00
PLESK5
e1deb9b26b remove folder from git 2016-08-16 14:18:12 +02:00
Boutique 37
838ed29ce3 #9440 2016-08-12 14:22:04 +02:00
Boutique 37
b20af01c31 #10402 2016-08-12 11:33:35 +02:00
Boutique 37
8c0b1f18e7 mail modif 2016-08-12 11:31:51 +02:00
Boutique 37
309511319b new images 2016-08-12 11:30:12 +02:00