Commit Graph

3040 Commits

Author SHA1 Message Date
fredtempez
7b40871927 Merge branch '10400' into data_engine 2020-10-28 19:26:16 +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
1a97c3b477 Merge branch '10400' into data_engine 2020-10-28 19:06:08 +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
fredtempez
b8772c0ac6 changes 2020-10-28 19:02:19 +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
fc1ac0c5e7 Merge branch '10400' into data_engine 2020-10-28 06:30:22 +01:00
fredtempez
27e4b9db3b Validation d'un commentaire 2020-10-28 06:29:49 +01:00
fredtempez
d1d0a485d7 Merge branch '10400' into data_engine 2020-10-27 21:38:28 +01:00
fredtempez
dc3d7dbe7c message de confrmation et de rejet 2020-10-27 21:37:56 +01:00
fredtempez
c88fbe4092 blacklist non créé + une seule variable des description des données 2020-10-27 21:21:30 +01:00
fredtempez
cff5837d41 Merge branch '10400' into data_engine 2020-10-27 20:56:19 +01:00
fredtempez
c46907396c changes 2020-10-26 21:05:48 +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
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