Commit Graph

90 Commits

Author SHA1 Message Date
Fred Tempez d24379e1cf Merge branch '114_dev' into 12_dev 2022-04-27 20:11:34 +02:00
Fred Tempez ab37ed0ea9 Vérification de type dans import de 11307 + suppression baseUrl de core + numéro de version de defaultdata 2022-04-27 16:30:51 +02:00
Fred Tempez 8670ee34d6 fira sans url incorrecte 2022-04-26 18:51:13 +02:00
Fred Tempez f833181e37 arvi roboto et lora websafe 2022-04-22 15:44:58 +02:00
Fred Tempez 0f86ced72d Merge branch '114_dev' into 12_dev
Option de redirection
2022-04-18 14:55:02 +02:00
Fred Tempez 1b2991e640 Option qui redirige les pages d'administration vers le login 2022-04-18 14:51:10 +02:00
Fred Tempez 0af64f6792 Merge branch '12_dev_db' into 12_dev 2022-04-14 22:09:58 +02:00
Fred Tempez d978e9ac5b suppression import de version 9 2022-04-14 22:08:23 +02:00
Fred Tempez 844296ae33 Merge branch '114_dev' into 12_dev 2022-04-13 22:47:58 +02:00
Fred Tempez 524bf1248e bug url relative dans tinymce 2022-04-12 13:26:08 +02:00
fredtempez 56f9cd9b76 collum devient column compatibilité assurée 2022-04-08 09:57:59 +02:00
fredtempez e59eecebc8 Merge branch '114_dev' into 12_dev 2022-04-01 08:40:19 +02:00
Fred Tempez b8016a3bc1 update quotes dans family name 2022-03-31 15:43:36 +02:00
Fred Tempez 0b2f514320 simple quotes 2022-03-31 15:40:16 +02:00
Fred Tempez f35fbb8c71 import presque ok 2022-03-31 15:37:44 +02:00
Fred Tempez c52c6f4438 import de fontes DIR_DATA !!!! 2022-03-31 15:07:16 +02:00
Fred Tempez 3f52396e9d import des fontes WIP 2022-03-31 15:03:13 +02:00
Fred Tempez fa2e4b2be0 import font locale en test 2022-03-31 14:57:50 +02:00
fredtempez 1fa2bab090 Merge remote-tracking branch 'origin/114_dev' into 12_dev 2022-03-29 13:09:35 +02:00
fredtempez 2b02e058c4 Met à jour les URL absolues 2022-03-29 13:07:31 +02:00
Fred Tempez 6a13590c9b Merge branch 'dev' into 12-dev 2022-03-21 18:35:11 +01:00
Fred Tempez 85651cb4db guillemets simples dans update 2022-03-21 18:30:17 +01:00
fredtempez 373a62a8be Merge branch 'dev' into 12-dev 2022-03-21 11:52:39 +01:00
fredtempez c6144c3aa8 update ajout des fontes locales 2022-03-21 11:18:01 +01:00
fredtempez b0d4823bec Merge branch 'dev' into 12-dev 2022-03-21 09:42:48 +01:00
fredtempez 40c6b8d787 Merge branch 'master' into dev 2022-03-21 09:42:25 +01:00
fredtempez edffeecda3 fontes okay 2022-03-21 09:33:12 +01:00
Fred Tempez 7c6ca6c940 arraycollumn quand même pour éviter les problèmes 2022-03-16 18:43:35 +01:00
fredtempez 71739486cf Merge branch 'dev' into 12-dev 2022-03-14 10:17:33 +01:00
fredtempez 6c29baf30f fira manquant de l'un des thèmes 2022-03-14 10:17:11 +01:00
fredtempez 9cc840d3ba Merge branch 'dev' into 12-dev 2022-03-14 09:39:59 +01:00
fredtempez 746f8d5a32 rafraichir les thèmes 2022-03-14 09:39:49 +01:00
Fred Tempez 6fa4d6402c resource 2022-03-13 14:47:01 +01:00
Fred Tempez 307a5ea0e1 resource 2022-03-13 14:45:48 +01:00
Fred Tempez ba7aa5ed51 url to ressource 2022-03-13 11:56:00 +01:00
Fred Tempez 0ad1126efa url -> ressource 2022-03-13 11:55:26 +01:00
Fred Tempez 3532288fcf Merge branch 'dev' into 12-dev 2022-03-13 10:20:05 +01:00
fredtempez 2aadc1bbaa Nouvelle structure de fontes ok 2022-03-11 14:03:42 +01:00
fredtempez 9dc533d7a9 Gestion des fontes des feuilles de style ok 2022-03-10 15:09:56 +01:00
fredtempez f5ba9c2ccb collumn avec un seul l 2022-03-09 12:24:23 +01:00
fredtempez 88a8793258 Fontes websafe + cdfonts en option 2022-03-08 10:47:26 +01:00
fredtempez dfde4ee228 Merge branch 'dev' into 12-dev 2022-03-07 15:28:19 +01:00
fredtempez 059efebddd Fontes websafe + cdfonts en option 2022-03-07 11:31:52 +01:00
Fred Tempez 1f9dd15f2c Merge branch 'master' into 114-dev 2022-02-26 14:26:51 +01:00
Fred Tempez 44b41c4cc1 proprité ExtraProsition false par défaut 2022-02-25 20:45:42 +01:00
Fred Tempez 17cc95ef22 petits bugs 2022-02-18 18:40:30 +01:00
Fred Tempez b49c7b5bf5 Récupération extra 2022-02-18 12:43:48 +01:00
Fred Tempez 3cc976b60e removeDir addon when no folder 2022-02-17 15:28:27 +01:00
Fred Tempez b2094b7834 Revert "Merge branch '11300' of https://forge.chapril.org/fredtempez/ZwiiCMS-private into 11300"
This reverts commit 81f2fad880, reversing
changes made to 333bc1f9cb.
2022-02-12 17:10:59 +01:00
fredtempez d146b240e6 Merge branch '11300' into extra 2022-02-11 15:16:51 +01:00