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

1234 Commits

Author SHA1 Message Date
Fred Tempez
f3926d2832 Merge branch 'master' into gallery_stock_v2 2020-04-02 21:38:56 +02:00
Fred Tempez
e726f446e4 [9.2.27] Pb de mise à jour 2020-04-02 21:30:54 +02:00
Fred Tempez
cc29d14c07 Merge branch 'master' into dev10 2020-04-02 19:09:39 +02:00
Fred Tempez
c460cb0bed merge master 2020-04-02 19:05:10 +02:00
Fred Tempez
dba71ce796 Merge branch 'master' into gallery_stock_v2 2020-04-02 19:03:59 +02:00
Fred Tempez
ab75b904a4 Version 2020-04-02 18:48:47 +02:00
Fred Tempez
4b7626ea91 Merge branch 'master' into dev10 2020-03-31 12:49:03 +02:00
Fred Tempez
06c42aa8d6 Merge branch 'master' into gallery_stock_v2 2020-03-31 12:47:23 +02:00
Fred Tempez
82967f0e1b [9.3.00] nettoyer theme.css + gitignore 2020-03-31 12:46:02 +02:00
Fred Tempez
2f94b27fc8 Merge branch 'master' into dev10 2020-03-31 10:11:02 +02:00
Fred Tempez
55a2dc887f Merge branch 'master' into gallery_stock_v2 2020-03-30 18:10:45 +02:00
Fred Tempez
cc9fa44052 [9.3.0] Couleurs de fond des champs de formulaire 2020-03-30 18:08:17 +02:00
Fred Tempez
1ec6fa2d96 Merge branch 'master' into dev10 2020-03-28 18:15:01 +01:00
Fred Tempez
c2d3fccff4 Merge branch 'master' into gallery_stock_v2 2020-03-28 18:14:33 +01:00
Fred Tempez
4892c0f798 [9.3.00] pointillés foxus menu 2020-03-28 18:13:58 +01:00
Fred Tempez
f768d40fd6 Merge branch 'master' into dev10 2020-03-28 17:57:06 +01:00
Fred Tempez
a7c4f5cbf3 Merge branch 'master' into gallery_stock_v2 2020-03-28 17:56:13 +01:00
Fred Tempez
92c1acb8f4 [9.3.00] couleur des boutons retour admin et thème 2020-03-28 17:55:51 +01:00
Fred Tempez
538fd38bbb Merge branch 'master' into dev10 2020-03-28 17:37:36 +01:00
Fred Tempez
6c4433b6a1 Merge branch 'master' into gallery_stock_v2 2020-03-28 17:35:25 +01:00
Fred Tempez
29851a51f1 [9.3.00] Sélecteur de pages barre admin 2020-03-28 17:34:59 +01:00
Fred Tempez
9f86fe4c9a [9.3.00] thème pages admin en mode réécriture, corrections dans tinymce 2020-03-28 16:24:42 +01:00
Fred Tempez
b1ac2afb2e Merge branch 'master' into gallery_stock_v2 2020-03-28 10:20:29 +01:00
Fred Tempez
79940a7393 Initialisation des champs galerie version inférieure 2020-03-28 10:16:59 +01:00
Fred Tempez
a81ac29e00 [9.3.00] CSS inutile (buttongrey) 2020-03-28 09:45:26 +01:00
Fred Tempez
c9ba833698 Merge branch 'master' into gallery_stock_v2 2020-03-27 19:09:57 +01:00
Fred Tempez
45b200aa4a [9.3.00] correction CSS + préparation galerie 2.0 2020-03-27 19:04:39 +01:00
Fred Tempez
5b122b167b [9.3.0] Couleur des boutons gris admin 2020-03-27 19:01:39 +01:00
Fred Tempez
5d8ad82ad6 Vérification erreur de saisie nom gallerie WIP 2020-03-27 18:58:47 +01:00
Fred Tempez
9d059aa01b Merge branch 'master' into gallery_stock_v2 2020-03-27 15:10:55 +01:00
Fred Tempez
e3da2f3dba Gallery v2 init 2020-03-27 15:06:35 +01:00
Fred Tempez
5329511c70 Merge branch 'master' into dev10 2020-03-24 18:25:37 +01:00
Fred Tempez
339b06f221 [9.2.26] droits 2020-03-24 18:22:45 +01:00
Fred Tempez
932b78650a manque récupération données ajax 2020-03-24 17:48:54 +01:00
Fred
50b54f93ed
Merge pull request #5 from brunoduc/brunoduc-patch-2 
Brunoduc patch 2
 2020-03-23 17:31:44 +01:00
Fred Tempez
89c5b3e535 Merge branch 'master' into dev10 2020-03-23 16:27:36 +01:00
Fred Tempez
6cad85c285 Version 2020-03-23 16:27:32 +01:00
Fred Tempez
fc7bfdd316 [9.2.26] étendre constantes 2020-03-23 16:16:45 +01:00
Fred Tempez
ee010b9dae Merge branch 'master' into dev10 2020-03-23 10:45:37 +01:00
Fred Tempez
215adf465d [9.2.26] fenetre login 2020-03-23 10:45:21 +01:00
Fred Tempez
c80d42a571 Merge branch 'master' into dev10 2020-03-23 10:39:06 +01:00
Fred Tempez
8dac462e79 [9.2.26] import style admin 2020-03-23 10:36:50 +01:00
Fred Tempez
7422df69fa [9.2.26] Position du menu lorsque le header est modifié 2020-03-23 10:34:53 +01:00
Fred Tempez
b1a411f8e7 [9.2.26] Suppression d'espaces 2020-03-23 10:25:41 +01:00
fredtempez
cd3d1d114b [9.2.26] marge de la barre d'admin 2020-03-23 10:01:12 +01:00
Fred Tempez
2fdb566fe1 Merge branch 'master' into dev10 2020-03-22 16:45:43 +01:00
Fred Tempez
d1783de185 [9.2.26] fix erreur de langue dans code mirror 2020-03-22 16:38:03 +01:00
Fred Tempez
6353f3a330 Merge branch 'master' into dev10 2020-03-22 16:09:27 +01:00
Fred Tempez
00a0ba769d [9.2.26] hover boutons admin 2020-03-22 16:08:34 +01:00
Fred Tempez
bc1fa8c53f [9.2.26] hover sur les boutons page admin 2020-03-22 16:06:43 +01:00
Fred Tempez
03d7a2db8e Merge branch 'master' into dev10 2020-03-22 15:44:53 +01:00
Fred Tempez
80398eca7f [9.2.26] Aperçu texte des boutons 2020-03-22 15:44:29 +01:00
Fred Tempez
78a602b208 Merge branch 'master' into dev10 2020-03-22 15:34:38 +01:00
Fred Tempez
9666e482e8 [9.2.26] Tinymce : menu sticky 2020-03-22 15:29:15 +01:00
Fred Tempez
797e670c44 Merge branch 'master' into dev10 2020-03-21 18:18:01 +01:00
Fred Tempez
6527d0c03a [9.2.26] classe buttonBlue supprimée 2020-03-21 18:17:43 +01:00
Fred Tempez
7e6cffd19a Merge branch 'master' into dev10 2020-03-21 18:09:59 +01:00
Fred Tempez
d5065cde88 Merge branch 'master' of https://github.com/fredtempez/ZwiiCMS 2020-03-21 18:08:10 +01:00
Fred Tempez
5adf44aeff [9.2.26] Thème admin + arrièreplan TinyMCE 2020-03-21 18:08:04 +01:00
Fred
8fdf0b9d8f
Merge pull request #3 from brunoduc/brunoduc-patch-1 
add gpx and kml extention
 2020-03-21 09:15:09 +01:00
Fred Tempez
6de8c27ce0 [9.2.26] thème des modules + oprimisation js edition page 2020-03-20 15:59:52 +01:00
Fred Tempez
23aa89069e [9.2.26] suppression ligne en trop 2020-03-20 15:08:10 +01:00
Fred Tempez
bb48004701 [9.2.26] Fix 2 background image dans tinymce 2020-03-20 15:04:54 +01:00
Fred Tempez
111263ba91 Merge branch 'master' into dev10 2020-03-20 09:12:42 +01:00
Fred Tempez
aaf380ae21 [9.2.26] fix arrièreplan TinyMCE 2020-03-20 08:57:11 +01:00
brunoduc
4f4f94e858
add gpx and kml extention 
For use with map.
 2020-03-19 18:07:00 +01:00
Fred Tempez
9e618dc123 Installation par défaut 2020-03-19 11:13:39 +01:00
Fred Tempez
f8a3a365b6 Merge branch 'master' into dev10 2020-03-16 18:55:58 +01:00
Fred Tempez
bfb93cddd1 [9.2.25] css site 2020-03-16 18:36:04 +01:00
Fred Tempez
375a98e957 Merge branch 'master' into dev10 2020-03-16 16:24:49 +01:00
Fred Tempez
90a84b7084 [9.2.25] Fix style site 2020-03-16 16:24:25 +01:00
Fred Tempez
0ed05e545f Merge branch 'master' into dev10 2020-03-16 15:29:13 +01:00
Fred Tempez
01b5f3458a [9.2.25] Thème menu monter la boite fonte pour faciliter la prévisualition 2020-03-16 15:27:53 +01:00
Fred Tempez
0c65fc56bb [9.2.25] Thème des pages d'admin 2020-03-16 15:25:31 +01:00
Fred Tempez
dc55de352b Merge branch 'master' into dev10 2020-03-16 10:40:40 +01:00
Fred Tempez
1496712bcf [9.2.25] https font google dans le select 2020-03-16 10:39:36 +01:00
Fred Tempez
d8eb134eba Merge branch 'master' into dev10 2020-03-16 10:21:27 +01:00
Fred Tempez
8c4ebad69a [9.2.25] Preview du site 2020-03-16 10:20:25 +01:00
Fred Tempez
2615198d7a [9.2.25] Preview footer ok 2020-03-16 08:59:10 +01:00
Fred Tempez
d25d319802 [9.2.25] Couleur administration neutre 2020-03-15 20:53:13 +01:00
Fred Tempez
b015d2894f Double déclaration news css 2020-03-15 17:53:56 +01:00
Fred Tempez
b443b22456 Merge branch 'master' into dev10 2020-03-15 17:48:06 +01:00
Fred Tempez
5816b3da36 [9.2.25] news signature et date couleurs dans default custom 2020-03-15 17:47:32 +01:00
Fred Tempez
7b654184c1 Merge branch 'master' into dev10 2020-03-15 17:33:13 +01:00
Fred Tempez
cfff2132c5 [9.2.25] Styles news dans common 2020-03-15 17:32:08 +01:00
Fred Tempez
0caaa2c10e Merge branch 'master' into dev10 2020-03-15 17:11:07 +01:00
Fred Tempez
21aecaf825 [9.2.25] Tinymce barre d'outils 2020-03-15 17:09:56 +01:00
Fred Tempez
257f836d4f Merge branch 'master' into dev10 2020-03-15 17:06:24 +01:00
Fred Tempez
72c727e773 [9.2.25] footer zindex under cookie concent 2020-03-15 17:04:41 +01:00
fredtempez
d7ea320daa merge master 2020-03-15 08:49:22 +01:00
fredtempez
cedf04e68c [9.2.25] tinymce menu barre outils 2020-03-15 08:44:46 +01:00
fredtempez
e8c630c21a [9.2.25] Décalage site SLB 2020-03-15 08:44:24 +01:00
fredtempez
446734949b [9.2.25] alléger codemirror 2020-03-14 19:12:11 +01:00
fredtempez
5f3d285452 [9.2.25]css body à cause de la galerie 2020-03-14 18:01:42 +01:00
fredtempez
49ced158a2 [9.2.25] nettoyage code mirror 2020-03-14 17:00:36 +01:00
Fred Tempez
321115bdc1 Merge branch 'master' into dev10 2020-03-14 10:32:40 +01:00
Fred Tempez
977a6f2a08 [9.2.25] arrièreplan ligne dans le curseur 2020-03-14 10:32:17 +01:00
Fred Tempez
91f998a602 Merge branch 'master' into dev10 2020-03-14 10:14:25 +01:00
Fred Tempez
5acfbdf787 [9.2.25] Codemirror dans Tinymce 2020-03-14 10:11:51 +01:00
Fred Tempez
99ecba2112 [9.2.24] codemirror standalone fix 2020-03-13 18:34:24 +01:00
fredtempez
7614f7b1b0 [9.2.25] config modiliée slb 2020-03-12 19:16:12 +01:00
Fred Tempez
2bf6880060 Css module de news 2020-03-12 14:54:53 +01:00
Fred Tempez
41c0e7e77e [10.0.043] version 2020-03-12 11:08:43 +01:00
Fred Tempez
589fe23b5c [10.0.043] SLB gallery 2020-03-12 11:06:41 +01:00
fredtempez
88b2948057 10.0.042 2020-03-12 10:15:26 +01:00
Fred Tempez
e5a128bdb5 Merge branch 'master' into dev10 2020-03-12 09:35:37 +01:00
Fred Tempez
2562138de5 [9.2.24] erreur thème menu : marge gauche 2020-03-12 09:35:18 +01:00
Fred Tempez
516946a608 Merge branch 'master' into dev10 2020-03-12 09:14:06 +01:00
Fred Tempez
a429a0c1c3 [9.2.24] décalage écran affichage SLB 2020-03-12 09:13:10 +01:00
fredtempez
a1b19d0032 merge master 2020-03-11 21:44:37 +01:00
fredtempez
566f352317 [9.2.24] fix problème simplelightbox 2020-03-11 21:42:59 +01:00
fredtempez
2229a11db7 [10.0.142] Tinymce insertion de code + coloration 2020-03-11 19:00:13 +01:00
fredtempez
a15f1ce1c8 [10.0.042] fix 2020-03-11 18:59:35 +01:00
Fred Tempez
02f319eeda Merge branch 'master' into dev10 2020-03-09 17:07:14 +01:00
Fred Tempez
7e0a48d150 [9.2.23] Problèmes divers avec thème menu 2020-03-09 17:05:39 +01:00
fredtempez
c8040983a6 WIP 2020-03-08 18:19:52 +01:00
fredtempez
b3595f144c Merge branch 'Tri_gallerie' of https://github.com/fredtempez/ZwiiCMS into Tri_gallerie 2020-03-08 17:04:38 +01:00
fredtempez
c7a7ded396 [9.2.23] Warning SLB 2020-03-08 16:55:55 +01:00
Fred Tempez
b6839bc0ac init WIp 2020-03-08 14:56:10 +01:00
Fred Tempez
0f683c6061 Merge branch 'master' into dev10 2020-03-06 21:21:05 +01:00
Fred Tempez
ba05ecd74a 10.0.041.rc 2020-03-06 21:20:54 +01:00
Fred Tempez
e5ab71be0a [9.2.23] burger animé 2020-03-06 21:18:34 +01:00
Fred Tempez
8797c166c6 Erreur defaultdata 2020-03-05 11:47:26 +01:00
Fred Tempez
4c399ecfe8 Merge branch 'master' into dev10 2020-03-05 11:46:56 +01:00
Fred Tempez
1dc451604b [9.2.23] simplelightbox update good version 2020-03-05 11:45:23 +01:00
Fred Tempez
a040c6aac0 [9.2.23] Tinymce barre d'outils 2020-03-04 20:36:52 +01:00
Fred Tempez
27beca355a [9.2.23] SimpleLightBox 2.1.0 2020-03-04 11:04:50 +01:00
Fred Tempez
c4e5a257d6 [9.2.23] fonction backup -> export 2020-03-03 15:08:18 +01:00
Fred Tempez
64f581ab7d Merge branch 'master' into dev10 2020-03-03 08:50:36 +01:00
Fred Tempez
bf1de5ae3c [9.2.23] Autoriser ICS dans RFM 2020-03-03 08:49:55 +01:00
Fred Tempez
66e46bec66 Erreur de nom de variable 2020-03-02 13:32:14 +01:00
Fred Tempez
1d93f10602 appels à Savedata() supprimés 2020-03-02 13:14:19 +01:00
Fred Tempez
f6b607248c Merge branch 'master' into dev10 2020-03-02 13:11:16 +01:00
Fred Tempez
7bba87fed9 [9.2.23] Proxy Web 2020-03-02 13:08:03 +01:00
Fred Tempez
f770c0d9e2 Merge branch 'master' into dev10 2020-03-02 11:52:52 +01:00
Fred Tempez
83801a175c Libellés 2020-03-02 11:43:55 +01:00
Fred Tempez
2e57893e08 Merge master 2020-03-02 11:38:50 +01:00
Fred Tempez
ba1f8e6b3d [9.2.23] Bouton de mise à jour forcée. 2020-03-02 11:22:18 +01:00
Fred Tempez
c1f6f60c06 Merge branch 'master' into dev10 2020-03-02 10:35:48 +01:00
Fred Tempez
f181aa9954 [9.2.23] autoupdate hebdo 2020-03-02 10:29:28 +01:00
Fred Tempez
c27d02d3c9 Icone dark 2020-03-01 18:57:40 +01:00
fredtempez
0d836021a5 [10.0.040.dev] favicone 2020-03-01 18:11:04 +01:00
fredtempez
36afbfcdc0 Modification config 2020-03-01 17:36:54 +01:00
fredtempez
bdcc2dceb6 Modification config 2020-03-01 17:31:15 +01:00
fredtempez
f79cd70b4a Libellés modifiées dans config 2020-03-01 17:18:59 +01:00
fredtempez
8c7efe9aa8 Merge master 9.2.23 2020-03-01 16:49:07 +01:00
fredtempez
e602d4df4c Merge master 9.2.23 2020-03-01 16:45:41 +01:00
fredtempez
1eb7895d63 [9.2.23] Llibellé 2020-03-01 16:44:49 +01:00
fredtempez
29ef1d5e68 Merge master 9.2.23 2020-03-01 16:43:09 +01:00
fredtempez
575e5f03a1 Merge master 9.2.23 2020-03-01 16:39:57 +01:00
fredtempez
61ae279f6d [9.2.23] sauvegarde auto 2020-03-01 16:36:50 +01:00
Fred Tempez
71057a387a [9.2.23] Mise à jour auto WIP 2020-03-01 16:04:59 +01:00
Fred Tempez
7d1b94f515 [9.2.23] Fix reply to email 2020-02-28 15:00:28 +01:00
Fred Tempez
953f9f06de fix reply to email 2020-02-28 14:58:50 +01:00
fredtempez
d550401eba merge master 9.2.23 2020-02-27 16:03:26 +01:00
fredtempez
77851208d9 Merge master 9.2.23 2020-02-27 15:54:57 +01:00
fredtempez
e5b7dd441d [9.2.23] Bouton mise à jour en ligne 2020-02-27 15:49:32 +01:00
fredtempez
8abcb9f823 [9.2.23] fonction dépréciée et replyto dans form 2020-02-26 23:45:49 +01:00
fredtempez
70714be2ff [10.0.037.dev] canal de mise à jour 2020-02-23 17:44:44 +01:00
fredtempez
6df8a83677 Merge branch 'master' into dev10 2020-02-23 17:35:07 +01:00
Fred Tempez
108e0d3fbf [9.22.22] Supprimer les thèmes dans codemirror de tinymce 2020-02-22 22:23:49 +01:00
Fred Tempez
5827e7a916 Merge branch 'master' into dev10 2020-02-20 14:30:44 +01:00
Fred Tempez
cd041c4ee8 [9.2.22] Codemirror ok mais pb de path 2020-02-20 14:30:23 +01:00
Fred Tempez
09f355f57e Merge branch 'master' into dev10 2020-02-20 11:30:48 +01:00
Fred Tempez
b0e43ed737 [9.2.22] Code mirror modifications en cours 2020-02-20 11:29:27 +01:00
fredtempez
f66f230565 [9.2.22] update channel fix 2020-02-19 09:59:17 +01:00
fredtempez
ee6b176784 [9.2.22] channel update 2020-02-19 09:55:51 +01:00
Fred Tempez
8bc15e54f3 [10.0.036.dev] fix aperçu des polices 2020-02-18 15:28:33 +01:00
Fred Tempez
12b8bf2ca5 [9.2.22] aperçu des polices fix 2020-02-18 15:26:55 +01:00
Fred Tempez
0d15efd316 Merge branch 'master' into dev10 2020-02-18 15:22:48 +01:00
Fred Tempez
01c71be0be [9.2.22] aperçu de la police dans les sélecteurs 2020-02-18 15:20:21 +01:00
Fred Tempez
26063d9b4b [10.0.036.dev] version aperçu police dans select 2020-02-18 15:11:10 +01:00
Fred Tempez
7b67951714 [10.0.036.dev] Aperçu des polices dans les sélecteurs 2020-02-18 15:07:57 +01:00
Fred Tempez
61e22d4831 [10.0.035.dev] Auto update ; génère un backup de data 2020-02-18 11:18:27 +01:00
Fred Tempez
9b9353adbb [10.0.034.dev] annulation dernier commit 2020-02-18 11:05:42 +01:00
Fred Tempez
6be6a39a1a [10.0.034.dev] canal de mise à jour WIP 2020-02-17 18:20:44 +01:00
Fred Tempez
eff8baf506 [10.0.033.dev] compatbilité v9 saveData dummy 2020-02-17 18:10:04 +01:00
Fred Tempez
c556552bf0 Merge branch 'dev10' of https://github.com/fredtempez/ZwiiCMS into dev10 2020-02-13 11:12:20 +01:00
Fred Tempez
d02fd09b6c Merge master 2020-02-13 11:11:35 +01:00
Fred Tempez
91007c9515 Merge branch 'master' into dev10 2020-02-13 11:10:18 +01:00
Fred Tempez
b2284caae4 [9.2.21] paramètre icône back to top 2020-02-13 10:48:56 +01:00
fredtempez
92542e8085 merge master 2020-02-11 20:12:51 +01:00
fredtempez
b41d28b0c8 [9.2.21] correction définitive des br dans le footer 2020-02-11 20:10:43 +01:00
Fred Tempez
2aa012479c (9.2.20] petite erreur de syntaxe 2020-02-11 11:09:11 +01:00
Fred Tempez
8f8221c9e0 merge master 9.2.20 2020-02-11 11:08:04 +01:00
Fred Tempez
1a5428c671 Merge branch 'master' into dev10 2020-02-11 11:07:08 +01:00
Fred Tempez
851c8689f5 [9.2.20] mise en page des gabarits dans le footer + erreur dans main.php 2020-02-11 11:05:03 +01:00
fredtempez
c9b55d87d5 [9.2.19] typo 2020-02-10 18:51:28 +01:00
Fred Tempez
84c35abdbe [10.0.030.dev] restore backup ajustements 2020-02-10 17:04:25 +01:00
Fred Tempez
123b3c4c2f [9.2.19] corrections CSS et parge par défaut (mentions légales) 2020-02-10 16:42:02 +01:00
Fred Tempez
90946cf9f1 [10.0.030.dev] correction CSS + modification config / restore and backup 2020-02-10 16:36:57 +01:00
Fred Tempez
72c2ac151c Merge branch 'master' into dev10 2020-02-10 13:33:14 +01:00
Fred Tempez
c69230c97a [9.2.18] complément de la page des mentions légales 2020-02-10 13:32:33 +01:00
Prof Langues
1032877b50 [10.0.029.dev] suppression de warning lors d el'installation - faviconDark 2020-02-07 09:11:22 +01:00
Fred Tempez
e5a0fa0066 [10.0.028.dev] vocabulaire 2020-02-06 21:11:31 +01:00
Fred Tempez
d42cc357fd [10.0.028.dev] Backup revu et corrigé, reste option dossier data inclus ou pas 2020-02-06 21:04:56 +01:00
Fred Tempez
ca1e2ba5cb [10.0.027.dev] erreur de validation backup restaure 2020-02-06 19:18:01 +01:00
Fred Tempez
4e5f2e015c [10.0.026] Correction dasn config 2020-02-05 18:12:45 +01:00
Fred Tempez
966c2e5172 Merge branch 'master' into dev10 2020-02-05 17:58:03 +01:00
Fred Tempez
f766080bba [9.2.18] Données par défaut site exemple 2020-02-05 17:35:47 +01:00