Commit Graph

3337 Commits

Author SHA1 Message Date
23bbbf114e check master et 10.6.03 2021-06-04 17:58:41 +02:00
8ed7d6ffe6 bad dataversion 2021-06-04 11:29:57 +02:00
226234d16c Merge branch 'master' of https://forge.chapril.org/ZwiiCMS-Team/ZwiiCMS 2021-06-04 11:28:14 +02:00
96bd53531d Merge branch 'master' of https://forge.chapril.org/ZwiiCMS-Team/ZwiiCMS 2021-06-04 11:28:04 +02:00
3cbe429de4 Merge branch 'master' of https://forge.chapril.org/ZwiiCMS-Team/ZwiiCMS 2021-06-04 11:27:39 +02:00
92cdf2d5d1 bad dataversion 2021-06-04 11:27:22 +02:00
81e376cefa Erreur de lein vers le site zwiicms.fr 2021-06-04 07:52:35 +02:00
fredtempez
6c15770ea2 readme 2021-05-20 21:59:08 +02:00
fredtempez
0134f11964 changes 2021-05-20 21:58:41 +02:00
fredtempez
ab72401a3a version 10602 2021-05-20 21:56:36 +02:00
fredtempez
e6789bb02a Restore 10602 in master 2021-05-20 21:52:09 +02:00
fredtempez
33d2a4d8c4 Revert "Merge erreur"
This reverts commit 323b46be00.
2021-05-20 21:38:47 +02:00
fredtempez
323b46be00 Merge erreur 2021-05-20 21:32:30 +02:00
fredtempez
127e3704c0 typo 2021-05-19 20:30:09 +02:00
fredtempez
bdd8d63d08 10602 bug journaux 2021-05-19 20:28:40 +02:00
9281e13e87 Merge branch 'master' into 11000 2021-05-15 15:27:48 +02:00
fa8ec8534e news 3.2 defaultdata 2021-05-15 14:18:01 +02:00
fb3ca86d81 update news versionData 2021-05-15 14:17:14 +02:00
8ec673b549 news 3.2 effet blur modifié 2021-05-15 13:49:04 +02:00
4486ce6513 news désactivation de l'effet flou 2021-05-15 12:17:53 +02:00
430befa3c4 Dépublication champ non saisi 2021-05-15 12:04:10 +02:00
5ba62c38ea Merge commit 'd8ec88cb4655c1e8d5a8866c645e59dfdf06b910' into 11000 2021-05-14 21:04:55 +02:00
a41492f174 Merge commit '27c91356fbcb3d88ce495e480e85cdb24b46319e' into 11000 2021-05-14 21:04:36 +02:00
665f9d336c Merge commit 'ffe62bbbf9b9ff2ce515dbd8bcf34152a4cd87cc' into 11000 2021-05-14 21:04:23 +02:00
c41aeb180d Merge commit '3caa1eb6a16e11b4ef1d558dc6668781beb45a05' into 11000 2021-05-14 21:03:14 +02:00
d8ec88cb46 Sélecteur de date bouton delete 2021-05-14 19:14:59 +02:00
6c12a2e772 Champs : hauteur select identique aux autres champs à 9px 2021-05-14 18:49:22 +02:00
27c91356fb Search 2.1 config vide 2021-05-14 17:52:07 +02:00
ffe62bbbf9 Bug placeholder 2021-05-14 17:25:51 +02:00
3caa1eb6a1 gitignore 2021-05-14 17:20:22 +02:00
50d46e8a0e Typo 2021-05-13 23:06:01 +02:00
fb52221d66 typo + gitignore 2021-05-13 22:58:12 +02:00
cf66ca0b99 Merge branch 'master' of https://forge.chapril.org/ZwiiCMS-Team/ZwiiCMS 2021-05-13 15:01:39 +02:00
bfcd71a518 nettoyage 2021-05-13 11:59:47 +02:00
33a4b0b2b7 nettoyage 2021-05-13 11:57:57 +02:00
fed35e00d4 Supprimer 'site/data/search/pages/recherche/theme.css' 2021-05-13 11:55:56 +02:00
f8013c4670 Supprimer 'site/data/news/pages/telechargement/theme.css' 2021-05-13 11:55:47 +02:00
a29035f382 Supprimer 'site/data/news/pages/accueil/theme.css' 2021-05-13 11:55:37 +02:00
8f8965fe18 Supprimer 'site/data/modules/news/actu/style.css' 2021-05-13 11:55:15 +02:00
76229e6dfc Bouton Help par défaut dans update() 2021-05-13 10:52:54 +02:00
ece9d87a79 Bug config advanced() setData i18n 2021-05-11 15:59:47 +02:00
fe0bd22668 Texte d'aide config view index 2021-05-11 11:31:01 +02:00
892b2a833a Bug sitemap $parent remplacé par $parentId 2021-05-11 07:51:43 +02:00
a9c01cb906 Bug sitemap $parent remplacé par $parentId 2021-05-11 07:50:29 +02:00
a6b0921f12 copyDir 2021-05-10 15:21:57 +02:00
54c472675c News update 2021-05-09 18:19:43 +02:00
e1ef89b1c2 news : add publishoff 2021-05-09 18:07:59 +02:00
293cf382c0 news : add publishoff 2021-05-09 17:54:20 +02:00
35efa6f16b Modification mineure dans le texte d'aide de la gestion des modules 2021-05-09 11:29:06 +02:00
c3e436c75e Personnalisation du bouton d'aide 2021-05-09 11:19:20 +02:00