remijean/ZwiiCMS
2
1
Fork 0
forked from ZwiiCMS-Team/ZwiiCMS
Code Pull Requests Activity
2,758 Commits 1 Branch 187 Tags 40 MiB
e7b320e5ad
Commit Graph

1813 Commits

Author SHA1 Message Date
Fred Tempez
135df50a66 merge 10400 fix 2020-11-14 16:16:51 +01:00
Fred Tempez
3c4e1f1294 Merge branch '10400' into module_i18n 2020-11-14 16:09:57 +01:00
Fred Tempez
d36a2048a6 Zwiico update 2020-11-14 16:04:30 +01:00
Fred Tempez
ea8fd8e097 Traduction auto 2020-11-14 15:49:01 +01:00
Fred Tempez
784d3b9cb8 Merge branch '10306' into module_i18n 2020-11-14 14:52:28 +01:00
Fred Tempez
34a26ea4ab trad auto hors connexion 2020-11-14 14:52:18 +01:00
Fred Tempez
972b86676e premier commit 2020-11-11 19:48:07 +01:00
Fred Tempez
cafb3cd1ee bug édition de page bouton option du module désactivé 2020-11-09 17:21:35 +01:00
Fred Tempez
dd00425e33 Merge branch 'master' into 10400 2020-11-07 17:50:37 +01:00
Fred Tempez
d486674d73 Réinitialisation des thèmes 2020-11-07 17:48:10 +01:00
Fred Tempez
256c9c62b2 core version 2020-11-05 07:49:16 +01:00
Fred Tempez
27df460d0c 10305 problème avec l'import d'une theme admin 2020-11-05 07:34:12 +01:00
Fred Tempez
159c7f82e2 Captcha simple : addition simple 2020-11-04 20:56:23 +01:00
Fred Tempez
7a31eb4ff1 Merge branch '10400' into data_engine 2020-11-04 20:40:22 +01:00
Fred Tempez
8fce54024e view light top margin 5% 2020-11-04 20:39:39 +01:00
Fred Tempez
01bffadc87 Merge branch '10400' into data_engine 2020-11-04 14:37:13 +01:00
Fred Tempez
f4048cfb4e Merge branch 'master' into 10400 2020-11-04 14:36:08 +01:00
Fred Tempez
ff951024ea mage light haute 150 px pour installation 2020-11-04 14:35:58 +01:00
Fred Tempez
13b70d499c Merge branch '10400' into data_engine 2020-11-04 14:07:45 +01:00
Fred Tempez
a7b7512ed5 Merge branch '10304' into 10400 2020-11-04 14:07:33 +01:00
Fred Tempez
67843f4f0f Nettoyage css 2020-11-04 13:35:07 +01:00
Fred Tempez
d06aa23eba générateur aléatoire 2020-11-04 13:26:25 +01:00
Fred Tempez
8105d466c9 redirection maintenance 2020-11-04 13:22:07 +01:00
Fred Tempez
47eef28318 inversion icones + et - config 2020-11-04 09:50:20 +01:00
Fred Tempez
3a5702e36b recharger le thème 2020-11-04 09:17:29 +01:00
Fred Tempez
f2e6af6dea Light div site marge haute 2020-11-04 09:15:08 +01:00
Fred Tempez
20c2858c36 Merge branch '10304' into 10400 2020-11-03 17:33:28 +01:00
Fred Tempez
f667587274 Icones dans la gestion du theme 2020-11-03 17:27:32 +01:00
Fred Tempez
8eed8d73fb Merge branch '10400' into data_engine 2020-11-03 17:11:10 +01:00
Fred Tempez
5e43d6fd21 Merge branch '10304' into 10400 2020-11-03 17:10:29 +01:00
Fred Tempez
493b8ff6b2 Contraste theme black 2020-11-03 17:09:53 +01:00
Fred Tempez
e7424dc9dd check la validité d'une thème importé 2020-11-03 15:34:57 +01:00
Fred Tempez
96b0a1a9b9 erreur de commentaire 2020-11-03 15:34:42 +01:00
Fred Tempez
52be6d2997 Bug theme menu 2020-11-03 12:02:59 +01:00
Fred Tempez
0a755dc1fa Merge branch '10400' into data_engine 2020-11-03 08:31:26 +01:00
Fred Tempez
66c2546b7a Merge branch '10304' into 10400 2020-11-03 08:31:07 +01:00
Fred Tempez
459f55081c warning primo installation 2020-11-03 07:48:56 +01:00
Fred Tempez
6634e99569 Merge branch '10400' into data_engine 2020-11-02 13:45:12 +01:00
Fred Tempez
31987f4066 Merge branch '10304' into 10400 2020-11-02 13:44:47 +01:00
Fred Tempez
ca411cf9a1 bug classe active dans menu latéral 2020-11-02 12:11:59 +01:00
Fred Tempez
72d3bb772f Couleur du sous-menu 2020-11-01 20:19:02 +01:00
Fred Tempez
ba7a0633b0 colorvariants option rgb supprime la transparence 2020-11-01 19:00:24 +01:00
Fred Tempez
62da5cc5b5 double arrière-plan dans le menu 2020-11-01 14:15:13 +01:00
Fred Tempez
f863b69a4d Localisation avec test de l'encodage 2020-11-01 13:38:25 +01:00
Fred Tempez
6180b903c9 Alignement du menu centré 2020-11-01 08:51:23 +01:00
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
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
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
b6023ede0f engine ok 2020-10-18 08:51:02 +02:00
Fred Tempez
617351290d init 2020-10-17 17:18:41 +02:00
Fred Tempez
0562fbe33c correctif sylvain 2020-10-17 16:45:30 +02:00
Fred Tempez
d4321076fc EDITOR devient MODERATOR 2020-10-14 19:17:13 +02:00
Fred Tempez
1749b1265f Merge branch '10303' into 10400 barre de membre 2020-10-14 09:50:50 +02:00
Fred Tempez
7644da6401 barre de membre alignée à droite. 2020-10-14 09:42:14 +02:00
Fred Tempez
6477265a8a Permissions en test 2020-10-12 19:12:38 +02:00
Prof Langues
d0827ca3e7 format date 2020-10-12 17:32:27 +02:00
Prof Langues
31961f112d syntaxe getUser 2020-10-12 16:59:44 +02:00
Prof Langues
1e2f6b9a6b syntaxte getUser 2020-10-12 16:47:35 +02:00
Prof Langues
50d12a210a position option captcha - icône login 2020-10-12 16:19:32 +02:00
Fred Tempez
2384367a68 Merge branch '10303' into 10400 2020-10-12 09:58:17 +02:00
Fred Tempez
0dc4df3b98 TLD com en fr 2020-10-12 09:49:17 +02:00
Fred Tempez
26841c795c captcha 10 ou 20 2020-10-11 19:29:33 +02:00
Fred Tempez
f8fa03e7de Données par défaut et update 2020-10-11 19:10:42 +02:00
Fred Tempez
5c35bd3c1d Permissions + correction nbre commentaires + noms des variables 2020-10-11 18:36:20 +02:00
Fred Tempez
1051fa0731 Merge branch '10303' into 10400 2020-10-11 05:07:53 +02:00
Fred Tempez
f0fe2c0177 Revert "instructions en double" 
This reverts commit c83e0e6b4f.
 2020-10-11 05:06:08 +02:00
Fred Tempez
4104fdf736 revert to core origin 2020-10-11 04:29:57 +02:00
Fred Tempez
f2fc03ce91 modif routeur test en cours 2020-10-11 04:15:38 +02:00
Fred Tempez
2f3db2d426 inversions 2020-10-11 03:49:39 +02:00
Fred Tempez
c83e0e6b4f instructions en double 2020-10-11 03:48:03 +02:00
Fred Tempez
920f012007 bug routeur 2020-10-11 03:34:13 +02:00
Fred Tempez
107c41f409 10303 routage 2020-10-10 20:22:14 +02:00
Fred Tempez
93e2dd40e3 Merge branch 'master' into 10400 2020-10-10 20:15:29 +02:00
Fred Tempez
a056755826 merge 10302 2020-10-09 08:45:03 +02:00
Fred Tempez
2e929d142b espaces en trop + supprimer = 2020-10-09 08:44:05 +02:00
Fred Tempez
62c0e29b44 modif Sylvain + gitignore png dans tmp 2020-10-09 08:37:34 +02:00
Fred Tempez
b9bc252979 Erreur de notification 2020-10-08 21:16:28 +02:00
Prof Langues
96d2fc2e0d Merge branch 'import_user' into blog_v3 2020-10-08 15:37:50 +02:00
Prof Langues
d0c14aaa49 merge 10302 2020-10-08 15:21:10 +02:00
Prof Langues
b4e7a0f5f4 erreur login captcha erroné 2020-10-08 15:16:01 +02:00
Prof Langues
332127401f Notifications 2020-10-08 12:55:19 +02:00
Prof Langues
50fd8a3c9d Notifications en cours 2020-10-08 12:49:09 +02:00
Prof Langues
5dfbe9a60d modif alogo de check + notification à revoir 2020-10-08 10:33:53 +02:00
Fred Tempez
a2b2896d80 envoi email en test 2020-10-07 19:39:31 +02:00
Fred Tempez
680af4c652 3.04.dev 2020-10-07 19:06:40 +02:00
Fred Tempez
643a60ddd5 données lors de l'ajout du user 2020-10-07 19:03:35 +02:00
Fred Tempez
5a151c577c bug changement de mot de passe 2020-10-07 19:01:57 +02:00
Fred Tempez
fe7a6f3ca0 Merge branch '10302' into import_user 2020-10-06 18:36:09 +02:00