194 Commits

Author SHA1 Message Date
PLESK5
e0ec9c3da6 Merge remote-tracking branch 'origin/ticket/10666' into devel 2016-08-31 15:03:28 +02:00
Christophe Latour
04cc34bb44 #10666
Largeur bandeaux
2016-08-31 15:02:54 +02:00
PLESK5
2a4ff0efd9 Merge remote-tracking branch 'origin/ticket/10666' into devel 2016-08-30 16:57:51 +02:00
Christophe Latour
91eb778797 fix 2016-08-30 16:57:17 +02:00
PLESK5
c2bf662c03 Merge remote-tracking branch 'origin/ticket/10655' into devel 2016-08-30 15:05:40 +02:00
Christophe Latour
62de897e8b #10655
Set bold header
2016-08-30 15:05:28 +02:00
PLESK5
92f7a9127d Merge remote-tracking branch 'origin/ticket/10666' into devel 2016-08-30 13:49:32 +02:00
Christophe Latour
8f7d18d4ce border 2016-08-30 13:49:27 +02:00
PLESK5
c7b91242a9 Merge remote-tracking branch 'origin/ticket/10666' into devel 2016-08-30 13:48:37 +02:00
Christophe Latour
96245432c0 border 2016-08-30 13:48:06 +02:00
PLESK5
190bb70832 Merge remote-tracking branch 'origin/ticket/10666' into devel 2016-08-30 13:34:02 +02:00
Christophe Latour
2d9b347550 color 2016-08-30 13:33:52 +02:00
PLESK5
561648d55b Merge remote-tracking branch 'origin/ticket/10666' into devel 2016-08-30 13:33:22 +02:00
Christophe Latour
d7d204309f color 2016-08-30 13:33:11 +02:00
PLESK5
3184bf7e2b Merge remote-tracking branch 'origin/ticket/10666' into devel 2016-08-30 13:20:13 +02:00
Christophe Latour
085a50c464 #10666#note-7 2016-08-30 13:19:43 +02:00
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