228 Commits

Author SHA1 Message Date
PLESK5
c1aeff1f0a Merge remote-tracking branch 'origin/ticket/10655' into devel 2016-08-30 13:00:27 +02:00
Christophe Latour
2a396ab080 #10655
Bandeau 1) entre la 4ème et la 5ème vente (position initiale du bandeau 2)
Bandeau 2) entre la 10ème et la 11ème vente
Bandeau 3) entre la 30ème et la 31ème vente
2016-08-30 13:00:07 +02:00
PLESK5
1ead60a353 Merge remote-tracking branch 'origin/ticket/10655' into devel 2016-08-30 12:43:00 +02:00
Christophe Latour
b119505924 #10655
Suppression du numéro de téléphonne
2016-08-30 12:36:56 +02:00
PLESK5
dc7851baa8 Merge remote-tracking branch 'origin/master' into devel 2016-08-30 11:36:35 +02:00
PLESK5
d570ad290e mails 2016-08-30 11:35:59 +02:00
PLESK5
042de149b6 Merge remote-tracking branch 'origin/fix/10666' 2016-08-26 16:34:59 +02:00
PLESK5
0b7deef072 Merge remote-tracking branch 'origin/fix/10666' into devel 2016-08-26 16:34:41 +02:00
Christophe Latour
c54e0bad5a #10666
Change border color to white
Ucfirst 'jusqu a'
2016-08-26 16:33:30 +02:00
PLESK5
66b9fb1d92 Merge remote-tracking branch 'origin/fix/10666' 2016-08-26 12:00:29 +02:00
PLESK5
081314d1a8 Merge remote-tracking branch 'origin/fix/10666' into devel 2016-08-26 12:00:11 +02:00
Christophe Latour
3c61dd78c8 adding padding left on text 2016-08-26 11:59:50 +02:00
PLESK5
23771e2434 Merge remote-tracking branch 'origin/fix/10666' 2016-08-26 11:53:51 +02:00
PLESK5
a84c9e13af Merge remote-tracking branch 'origin/fix/10666' into devel 2016-08-26 11:53:26 +02:00
Christophe Latour
0f3a3b9959 Small fix 2016-08-26 11:52:58 +02:00
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