Commit Graph

1668 Commits

Author SHA1 Message Date
Fred Tempez 746163e0d1 Merge branch '10400' into data_engine 2020-11-01 07:59:02 +01:00
Fred Tempez ae98d2f1ae Merge branch '10304' into 10400 localisation alignement menu 2020-11-01 07:57:20 +01:00
Fred Tempez 53c82522aa Localisation FR 2020-11-01 07:56:04 +01:00
Fred Tempez b8e0d53288 alignement du menu 2020-10-31 18:34:55 +01:00
Fred Tempez b192070782 Merge branch '10400' into data_engine 2020-10-31 17:57:02 +01:00
Fred Tempez 23fa96a2b6 table des très petits écrans 2020-10-31 17:56:18 +01:00
Fred Tempez 6fae1187e3 installation et ajout d'un user 2020-10-31 17:55:54 +01:00
Fred Tempez 2f27ca0235 Merge branch '10400' into data_engine 2020-10-31 17:40:57 +01:00
Fred Tempez bbc727d400 captcha évolué suite et fin 2020-10-31 17:37:39 +01:00
fredtempez 4f6f4139bb Merge branch '10400' into data_engine 2020-10-29 22:07:34 +01:00
fredtempez 17890bc81d table responsive 2020-10-29 22:06:13 +01:00
fredtempez 71e12a5ada Merge branch '10400' into data_engine 2020-10-29 19:14:35 +01:00
fredtempez 567a70d909 espaces 2020-10-29 19:14:19 +01:00
Fred 3fefff219d
Update init.js 2020-10-29 15:44:03 +01:00
Fred 1915f554b7
Update template.class.php 2020-10-29 13:50:10 +01:00
fredtempez aff90ba298 Merge branch '10400' into data_engine 2020-10-28 19:36:59 +01:00
fredtempez 5de144f947 Optimisation captcha 2020-10-28 19:36:23 +01:00
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
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 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 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 bcbcb79a12 bug affichage menu petits écrans + barre admin 2020-10-24 17:01:40 +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 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
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 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