Commit Graph

1669 Commits

Author SHA1 Message Date
fredtempez
50e508f486 Merge branch '10400' into editeur 2020-10-28 19:26:33 +01:00
fredtempez
cf6b37f49d Merge branch '10304' into 10400 2020-10-28 19:25:10 +01:00
fredtempez
d0e1f5abe1 tinymce 4.9.11 2020-10-28 19:24:00 +01:00
fredtempez
4cdb1fe7c3 Merge branch '10304' into editeur 2020-10-28 19:05:33 +01:00
fredtempez
f615a37473 Merge branch '10400' of https://github.com/fredtempez/ZwiiCMS into 10400 2020-10-28 19:04:50 +01:00
fredtempez
e7c19df92e Merge branch '10304' into 10400 2020-10-28 19:04:43 +01:00
Fred
e5d838b345
Update template.class.php 2020-10-28 08:21:58 +01:00
fredtempez
41c44b4557 thème admin css 2020-10-28 07:53:51 +01:00
fredtempez
70a5e967bd Merge branch '10400' into editeur 2020-10-27 20:57:08 +01:00
fredtempez
3355e0311e Captcha arithmétique 2020-10-26 20:59:54 +01:00
fredtempez
dd65cdb3c2 Présentation améliorée du mail 2020-10-25 22:55:21 +01:00
fredtempez
ec59a0c77c 2 bugs de thème : import admin et nettoyage tmp 2020-10-25 22:49:28 +01:00
Fred Tempez
772bda27e6 Merge branch '10304' into 10400 2020-10-25 09:48:11 +01:00
Fred Tempez
79b8fd01c8 droits sur le module 2020-10-25 09:45:14 +01:00
Fred Tempez
7c8175a24d affiche le droit courant modif par admin 2020-10-25 08:35:34 +01:00
Fred Tempez
7a9c1fd142 erreu module 2020-10-25 08:28:55 +01:00
Fred Tempez
bcbcb79a12 bug affichage menu petits écrans + barre admin 2020-10-24 17:01:40 +02:00
Fred Tempez
11e28f51fc Merge branch 'master' into editeur 2020-10-22 19:20:56 +02:00
Fred Tempez
2fd69d0950 Merge branch 'master' into 10400 2020-10-22 19:20:42 +02:00
Fred Tempez
645cb7fef5 minor fix 2020-10-22 19:16:53 +02:00
Prof Langues
05f64946a6 Merge branch 'master' into 10400 2020-10-22 08:50:27 +02:00
Prof Langues
227b3943a3 Petites corrections 2020-10-22 08:47:02 +02:00
Fred Tempez
5e96a306e0 Merge branch '10400' into editeur 2020-10-20 19:20:00 +02:00
Fred Tempez
d2f643634e Bouton vert 2020-10-20 19:19:21 +02:00
Prof Langues
3bd8f8cf3f Merge branch '10400' into editeur 2020-10-20 10:00:11 +02:00
Prof Langues
1cfdd115bb Jeu d'icônes 2020-10-20 09:58:14 +02:00
Prof Langues
91093014f3 Merge branch '10303' into editeur 2020-10-20 09:29:07 +02:00
Prof Langues
fcd20f61e5 Merge branch '10303' into 10400 2020-10-20 09:28:01 +02:00
Prof Langues
a37c02f8ac compatibilité 750px 2020-10-20 09:25:56 +02:00
Fred
fd02c81190
Update index.php 2020-10-19 20:46:12 +02:00
Fred Tempez
2c7f2b6c96 Revert "Revert "Jeu d'icônes""
This reverts commit 024f7451e6.
2020-10-19 19:11:39 +02:00
Fred Tempez
024f7451e6 Revert "Jeu d'icônes"
This reverts commit f17161f9e9.
2020-10-19 19:11:04 +02:00
Fred Tempez
f17161f9e9 Jeu d'icônes 2020-10-19 19:08:26 +02:00
Fred Tempez
f5bda47965 fix captcha simple 2020-10-19 18:49:33 +02:00
Fred Tempez
fe60147bd2 Merge branch '10400' into editeur 2020-10-19 18:21:15 +02:00
Fred Tempez
8abe700c42 Merge branch '10303' into 10400 2020-10-19 18:20:55 +02:00
Fred Tempez
5427853357 Revert "captcha simple par défaut - changement de structure de stockage"
This reverts commit 87d8f2a22a.
2020-10-19 18:20:23 +02:00
Fred Tempez
c5a4e16726 captcha faible 2020-10-19 18:19:50 +02:00
Prof Langues
87d8f2a22a captcha simple par défaut - changement de structure de stockage 2020-10-19 17:07:37 +02:00
Prof Langues
01cd75cfd0 Revert "Erreur d'icônes sous Win ?"
This reverts commit 0952e597e4.
2020-10-19 15:38:20 +02:00
Prof Langues
0952e597e4 Erreur d'icônes sous Win ? 2020-10-19 15:20:10 +02:00
Fred Tempez
f382a5a16b Vérification de la valeur groupe 2020-10-19 09:53:28 +02:00
Fred Tempez
96425a116f version 2020-10-19 09:24:43 +02:00
Fred Tempez
fdd52d206c Aide connexion menu 2020-10-19 09:24:28 +02:00
Fred Tempez
23757e3fbc Champ d'import manquant 2020-10-19 09:22:56 +02:00
Fred Tempez
24bae1270f Merge branch '10400' into editeur 2020-10-18 17:30:52 +02:00
Fred Tempez
f80db3cacf icone mail au lieu de comment 2020-10-18 17:27:20 +02:00
Fred Tempez
559d0d5c95 Merge branch '10400' into editeur 2020-10-18 17:20:51 +02:00
Fred Tempez
cd41906adf Notification mail : icone dans la liste 2020-10-18 17:19:20 +02:00
Fred Tempez
ff98f2d478 Merge branch '10400' into editeur 2020-10-17 16:45:54 +02:00