Commit Graph

59 Commits

Author SHA1 Message Date
Rafael Ameijeiras 9651177034 Merge branch 'ent-11059-mejora-visual-en-widget-top-n-eventos' into 'develop'
Ent 11059 Mejora visual en widget Top-N Eventos

See merge request artica/pandorafms!6169
2023-08-18 06:36:40 +00:00
Daniel Cebrian 06eae47560 Merge branch 'develop' into ent-11326-security-hardening-console 2023-08-09 13:27:21 +02:00
Daniel Maya aef7f0edd0 #11739 Fixed deprecated functions 4 2023-08-01 14:51:31 +02:00
Daniel Maya 0d321f5311 #11739 Fixed deprecated functions 3 2023-08-01 11:19:04 +02:00
Daniel Cebrian 001ffc1799 Merge branch 'develop' into ent-11326-security-hardening-console 2023-07-26 10:55:49 +02:00
Daniel Cebrian a3d5bd80f9 #11326 fixed dark theme in security hardening 2023-07-25 14:25:16 +02:00
Daniel Cebrian e88a33d984 #11326 added new property in chartjs 2023-07-24 12:22:20 +02:00
Félix Suárez 51abf5328a Change URL and Email references 2023-06-28 17:55:25 -06:00
Daniel Cebrian eac656dfc0 #11059 fixed setted number 2023-06-22 15:08:52 +02:00
Daniel Cebrian 66ba29581b #11059 added new property in graphjs for add text in center 2023-06-22 15:06:16 +02:00
daniel a0dbfa698e Merge remote-tracking branch 'origin/develop' into ent-10833-15134-bug-en-chromium-111-0-5563-64-1
Conflicts:
	pandora_console/composer.json
	pandora_console/composer.lock
	pandora_console/vendor/composer/installed.php
2023-04-20 16:35:50 +02:00
daniel ad8401413b update composer 2023-04-10 12:33:06 +02:00
Jonathan 000ab68327 #10490 TinyMCE Upgrade V6 2023-04-04 11:24:49 +02:00
Jonathan 10c0d95f34 Reports PDFS changes 2023-03-13 14:21:10 +01:00
Daniel Maya defb5b1fe2 #10098 changed message 3 2023-01-04 15:34:36 +01:00
Daniel Maya 40d452b6c0 #10098 changed message 2 2023-01-04 11:38:03 +01:00
Daniel Maya 3eee3d8866 #10098 changed message 2023-01-04 10:54:19 +01:00
daniel 1dee676d5b phpchartjs pandora_enterprise#9554 2022-12-21 12:33:53 +01:00
daniel ae88c33aad composer static phpchartjs pandora_enterprise#9554 2022-12-20 14:22:13 +01:00
Daniel Barbero 01d14ae3b8 new chart chartjs pandora_enterprise#9554 2022-12-13 09:10:13 +01:00
Calvo d525cb594c WIP: Download wait message 2022-12-02 09:42:24 +01:00
Ramon Novoa 9f12b09fbf Move .exe files to Fit LFS. 2022-10-20 12:16:26 +02:00
Daniel Barbero Martin 8dd9523b40 refactor events meta pandora_enterprise#9086 2022-06-03 09:20:51 +02:00
Daniel Barbero Martin d3e3ff3d9c refactor events meta pandora_enterprise#9086 2022-06-01 17:39:12 +02:00
fbsanchez 89428b377c Moved from vendor to independent folder inside PandoraFMS Project #8731#note_144708 2022-04-12 13:12:05 +02:00
fbsanchez dd1768535d Vendor files update (unneeded in a while) 2022-03-29 19:22:26 +02:00
fbsanchez b832fd17e4 update_manager_client => vendor 2022-03-28 12:20:36 +02:00
fbsanchez 2aad6404a2 php8 with php72 support 2022-01-13 13:48:25 +01:00
fbsanchez fee3f4ab96 php8 review + mdpf update 2022-01-12 14:22:16 +01:00
fbsanchez 31f329a833 Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red
Conflicts:
	pandora_console/vendor/composer/autoload_classmap.php
	pandora_console/vendor/composer/autoload_static.php
2021-10-05 10:57:00 +02:00
fbsanchez 15c2bdf17b WIP NCM 2021-09-28 18:53:22 +02:00
Daniel Maya 71767a3f11 Added basic chart 2021-07-16 14:16:45 +02:00
fbsanchez 9b31906bdf Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
Conflicts:
	pandora_console/extras/mr/48.sql
2021-07-13 10:01:59 +02:00
Daniel Maya a4203aaee2 Ent 7272 nuevos elementos consola visual odómetro 2021-07-12 10:27:10 +00:00
fbsanchez cb8fcca0e9 Datatype fix in db_get_lock, updated classmap 2021-06-24 13:04:45 +02:00
fbsanchez 085e0ba300 Added Files class to handle zip/unzip/rmrf and more 2021-06-11 10:48:58 +02:00
Marcos Alconada 665efa4fb7 Ent 7519 cambio de fuentes en la consola a nivel global 2021-06-10 08:19:11 +00:00
Daniel Rodriguez 4b819360ff Revert "Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'"
This reverts merge request !4132
2021-06-09 18:09:43 +02:00
Marcos Alconada 2334eccd01 Ent 7519 cambio de fuentes en la consola a nivel global 2021-06-09 13:59:28 +00:00
fbsanchez 09ccaf254e Fixed public access and added PublicLogin interface, including code style fixex 2021-05-19 11:31:52 +02:00
fbsanchez e0aa1bfc68 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/include/styles/pandora.css
2021-03-22 09:59:07 +01:00
Marcos Alconada d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
fbsanchez c7706a6bfa WIP Historical database manager (setup) 2021-01-27 12:35:37 +01:00
fbsanchez 5799c3e199 composer paths updated 2021-01-25 13:35:58 +01:00
fbsanchez d9428ce215 WIP DBMainainer, fixed Websockets library placement 2021-01-25 13:33:02 +01:00
José González 311b259684 Backup upload 2020-06-30 12:16:51 +02:00
Luis bbf6fe8beb Fixed image modules historic report 2020-06-22 11:20:26 +02:00
Daniel Rodriguez 58ac2e10da Merge branch 'ent-5570-9352-Bug-al-crear-PDF-con-graficas-con-token-allow-url-fopen' into 'develop'
Ent 5570 9352 bug al crear pdf con graficas con token allow url fopen

See merge request artica/pandorafms!3222
2020-06-02 09:22:27 +02:00
Daniel Maya c8414c67ea Fixed allow_url_fopen with Mpdf 2020-05-20 13:29:31 +02:00
fbsanchez 57ccd783b0 Merge branch 'develop' into 'ent-5756-pantallas-de-configuracion-del-cluster' 2020-05-14 17:42:58 +02:00