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

2460 Commits

Author SHA1 Message Date
Fred Tempez 80ee16aa82 Revert "Permissions de l'article" 
This reverts commit e24461fa2d.
 2020-10-12 18:32:55 +02:00
Prof Langues e24461fa2d Permissions de l'article 2020-10-12 17:31:38 +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 f9569b1085 permissions sur modules externes 2020-10-11 05:16:20 +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 589fe9f8cb changes 2020-10-11 04:31:30 +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 339241383f changes 2020-10-10 19:36:09 +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
Fred Tempez 00a3243d87 gitignore 2020-10-08 20:47:57 +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 2c3124b462 Merge branch 'import_user' of https://github.com/fredtempez/ZwiiCMS into import_user 2020-10-07 19:02:02 +02:00