Commit Graph

80 Commits

Author SHA1 Message Date
Pablo Aragon ca05b6d81f 13675-Hide items in Templates reports 2024-05-03 09:18:32 +02:00
Jose Martin e06b0928ac Merge branch 'ent-13507-Black-Theme-Netflow-Explorer-iconos-de-filtro-y-vista-con-fondo-negro-se-ven-mal' into 'develop'
Ent 13507 black theme netflow explorer iconos de filtro y vista con fondo negro se ven mal

See merge request artica/pandorafms!7303
2024-04-30 08:57:31 +00:00
Jorge Rincon a2ab92f90b #13507 Fixed dark theme style in the Netflow explorer chart label. 2024-04-29 13:04:01 +02:00
Daniel Cebrian 4c485be711 Merge branch 'develop' into ent-13035-cambiar-comportamiento-del-mecanismo-de-loginhash-meta 2024-04-26 12:41:08 +02:00
Pablo Aragon a75af90a6e 13616-Fix text color chartjs with dark theme 2024-04-22 15:31:37 +02:00
Daniel Cebrian a3a3fa7e70 #13035 added Lcobucci\Clock 2024-04-03 11:03:13 +02:00
Daniel Cebrian 670829fa58 #13035 added JWT repository 2024-04-02 16:53:13 +02:00
Daniel Cebrian b6cb9a7fd8 #12978 fixed short name in chart 2024-03-13 10:40:58 +01:00
Daniel Maya 10b9158029 #12970 added error message 2024-03-06 13:01:04 +01:00
daniel 9771639318 Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0
Conflicts:
	pandora_console/extras/mr/68.sql
	pandora_console/pandoradb.sql
2024-02-27 17:27:10 +01:00
Daniel Cebrian c18ecd0f01 #12864 added halfpastfouram in phpchartjs 2024-02-13 13:05:29 +01:00
daniel 851b046add Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0 2024-02-12 08:05:36 +01:00
daniel 54e4b8dbfa new api 2.0 2024-02-02 09:15:00 +01:00
daniel 366b68a571 new api 2.0 2024-01-24 11:47:02 +01:00
Daniel Cebrian d504267460 Merge branch 'develop' into ent-12460-cientos-de-errores-en-el-log-de-apache 2024-01-22 15:18:01 +01:00
Daniel Cebrian 209b4b3e8b #12460 fixed deprecated in library phpchartjs 2024-01-17 12:41:56 +01:00
daniel b2a5472be3 new api 2.0 2024-01-12 08:22:17 +01:00
Jonathan c593161525 #12398 change urls wiki 2023-12-12 12:22:51 +01:00
Daniel Cebrian ba64bfb882 #11126 refactored 2023-11-06 15:49:19 +01:00
Daniel Cebrian 533201197a #11126 new view vulnerabilities scanner 2023-10-13 12:25:25 +02:00
Calvo 83966ac157 Recovered php version error message 2023-09-07 19:45:14 +02:00
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