lapervenche/ZwiiCMS
1
0
Fork 0
forked from ZwiiCMS-Team/ZwiiCMS
Code Issues Pull Requests Projects Releases Activity
2,623 Commits 7 Branches 0 Tags 27 MiB
f332d8e3d2
Commit Graph

1714 Commits

Author SHA1 Message Date
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
Fred Tempez
0562fbe33c correctif sylvain 2020-10-17 16:45:30 +02:00
Fred Tempez
0ae5d80c28 Merge branch '10400' into editeur 2020-10-14 19:21:20 +02:00
Fred Tempez
d4321076fc EDITOR devient MODERATOR 2020-10-14 19:17:13 +02:00
Fred Tempez
7048cc37f4 Merge branch '10400' into editeur 2020-10-14 10:31:54 +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
b146f42355 Merge branch '10400' into editeur 2020-10-12 09:58:31 +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
50f8d5afe3 Revert "Modif Sylvain" 
This reverts commit 87d2e22577.
 2020-10-11 18:45:43 +02:00
Fred Tempez
87d2e22577 Modif Sylvain 2020-10-11 18:42:54 +02:00
Fred Tempez
5c35bd3c1d Permissions + correction nbre commentaires + noms des variables 2020-10-11 18:36:20 +02:00
Fred Tempez
ef71b79225 protection changement module 2020-10-11 16:54:52 +02:00
Fred Tempez
96041f1842 Revert "Revert "permission changement de module + réécriture test dans les fonctions page"" 
This reverts commit 3a5b0afe74.
 2020-10-11 14:21:12 +02:00
Fred Tempez
3a5b0afe74 Revert "permission changement de module + réécriture test dans les fonctions page" 
This reverts commit 468bb2cd25.
 2020-10-11 14:19:50 +02:00
Fred Tempez
468bb2cd25 permission changement de module + réécriture test dans les fonctions page 2020-10-11 14:16:10 +02:00
Fred Tempez
32e727eb71 Merge branch '10303' into editeur 2020-10-11 05:09:37 +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
bd82e0337e bloquage niveau page 2020-10-11 05:03:47 +02:00
Fred Tempez
088cd6fc69 Merge branch '10303' into editeur 2020-10-11 04:36:41 +02:00
Fred Tempez
4104fdf736 revert to core origin 2020-10-11 04:29:57 +02:00
Fred Tempez
f4d75f0142 Revert "bug routeur" 
This reverts commit 920f012007.
 2020-10-11 04:27:57 +02:00
Fred Tempez
f1da9bead6 Merge branch '10303' into editeur 2020-10-11 04:16:17 +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
2ca430f7b4 Merge branch '10303' into editeur 2020-10-11 03:46:23 +02:00
Fred Tempez
920f012007 bug routeur 2020-10-11 03:34:13 +02:00
Fred Tempez
1a981b490d Merge branch '10303' into editeur 2020-10-10 20:23:17 +02:00
Fred Tempez
107c41f409 10303 routage 2020-10-10 20:22:14 +02:00
Fred Tempez
81e5f27227 Merge branch '10400' into editeur 2020-10-10 20:15:52 +02:00
Fred Tempez
93e2dd40e3 Merge branch 'master' into 10400 2020-10-10 20:15:29 +02:00
Fred Tempez
f1f5d5414f Init 2020-10-10 10:54:38 +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