Commit Graph

2820 Commits

Author SHA1 Message Date
Fred Tempez
34aac7834a merge 10304 2020-10-25 09:47:33 +01:00
Fred Tempez
8a66c3d1ae Merge branch '10304' of https://github.com/fredtempez/ZwiiCMS into 10304 2020-10-24 17:02:12 +02:00
Fred Tempez
bcbcb79a12 bug affichage menu petits écrans + barre admin 2020-10-24 17:01:40 +02:00
Fred Tempez
a892fd9855 bug affichage menu petit écrans + barre admin 2020-10-24 16:59:19 +02:00
Fred Tempez
f6cf9c107a Merge branch 'master' into data_engine 2020-10-22 19:21:21 +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
f5a31309b9 Merge branch 'master' into data_engine 2020-10-21 17:08:35 +02:00
Fred Tempez
2d41fad30d Merge branch 'master' into 10400 2020-10-21 17:07:19 +02:00
Fred Tempez
c0494b6ae6 Merge branch 'master' of https://github.com/fredtempez/ZwiiCMS 2020-10-21 17:06:41 +02:00
Fred Tempez
dbf12fc999 changes 2020-10-21 17:06:23 +02:00
Fred Tempez
868271617a Commentaires 2020-10-21 17:04:07 +02:00
Fred Tempez
1d4e9a1862 Merge branch '10400' into data_engine 2020-10-20 19:19:38 +02:00
Fred Tempez
d2f643634e Bouton vert 2020-10-20 19:19:21 +02:00
Fred Tempez
8c8d42344d Merge branch 'master' into data_engine 2020-10-20 18:45:53 +02:00
Fred Tempez
9596ca9932 Merge branch 'master' into 10400 2020-10-20 18:45:31 +02:00
Fred Tempez
7b5f1aab4e changes 2020-10-20 18:45:15 +02:00
Fred Tempez
a741f0ddcd Merge branch 'master' into data_engine 2020-10-20 18:33:54 +02:00
Fred Tempez
cde72fe1ce Merge branch 'master' into 10400 2020-10-20 18:33:12 +02:00
Fred Tempez
c83e8e3149 Commentaires 2020-10-20 18:32:25 +02:00
Prof Langues
e07285259b Merge branch '10400' into data_engine 2020-10-20 09:58:35 +02:00
Prof Langues
1cfdd115bb Jeu d'icônes 2020-10-20 09:58:14 +02:00
Prof Langues
00ad2cc3a4 Merge branch '10303' into data_engine 2020-10-20 09:29:50 +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
6df7256a98
Update index.php 2020-10-19 20:48:18 +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
22dfce63b9 Merge branch '10400' into data_engine 2020-10-19 18:21:36 +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
85c8e923d2 Merge branch '10303' of https://github.com/fredtempez/ZwiiCMS into 10303 2020-10-19 18:19:55 +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
7e310da9c2 Merge branch '10400' into data_engine 2020-10-18 17:30:27 +02:00
Fred Tempez
f80db3cacf icone mail au lieu de comment 2020-10-18 17:27:20 +02:00
Fred Tempez
c535d7560a Merge branch '10400' into data_engine 2020-10-18 17:20:28 +02:00
Fred Tempez
cd41906adf Notification mail : icone dans la liste 2020-10-18 17:19:20 +02:00
Fred Tempez
97110dd032 Merge branch '10400' into data_engine 2020-10-18 13:24:21 +02:00