Commit Graph

831 Commits

Author SHA1 Message Date
miguel angel rasteu 1108f657ea #12701 Fix recursion filter token in angent module view 2023-12-26 09:16:12 +01:00
daniel e07f66885d Merge remote-tracking branch 'origin/develop' into ent-12067-huevo-de-pascua-piensa-en-verde
Conflicts:
	pandora_console/index.php
2023-12-19 14:56:04 +01:00
daniel 8aeee6d876 Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 2023-12-18 11:15:18 +01:00
daniel 3cb4b5cce4 Merge remote-tracking branch 'origin/develop' into ent-12333-anadir-tablas-dinamicas-a-pandoradb-sql
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/extras/mr/67.sql
	pandora_console/operation/menu.php
2023-12-14 11:21:51 +01:00
daniel cc12c77008 Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
Conflicts:
	pandora_console/include/styles/pandora.css
2023-12-13 10:39:48 +01:00
Rafael Ameijeiras d072187a2c Merge branch 'ent-12605-vista-de-agentes-error-500-en-develop' into 'develop'
fix error 500 and warnings pandora_enterprise#12605

See merge request artica/pandorafms!6738
2023-12-11 14:27:39 +00:00
Jonathan 52ce386ea8 Merge branch 'develop' into ent-12150-errores-en-los-cambios-para-los-logs-de-consola-y-directorios 2023-12-11 10:31:07 +01:00
daniel 1d36d8a436 fix error 500 and warnings pandora_enterprise#12605 2023-12-05 09:14:02 +01:00
daniel f9e7f19771 Merge remote-tracking branch 'origin/develop' into ent-12333-anadir-tablas-dinamicas-a-pandoradb-sql 2023-11-28 08:43:45 +01:00
daniel f6f0f15731 Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.item_editor.php
	pandora_console/include/graphs/fgraph.php
	pandora_console/include/lib/Dashboard/Widgets/single_graph.php
	pandora_console/include/styles/pandora.css
2023-11-28 08:29:10 +01:00
daniel 3f3e8e42bc move extension translate_string and file_repo pandora_enterprise#12333 2023-11-28 08:13:00 +01:00
Matias Didier 746eb298ea Merge branch 'ent-11831-literales-de-opciones-de-menu-no-coinciden' into 'develop'
Ent 11831 literales de opciones de menu no coinciden

See merge request artica/pandorafms!6437
2023-11-28 07:07:58 +00:00
Rafael Ameijeiras 2fa8ed3c9e Merge branch 'ent-12219-error-al-eliminar-perfiles-en-edicion-de-usuario' into 'develop'
Ent 12219 error al eliminar perfiles en edicion de usuario

See merge request artica/pandorafms!6555
2023-11-27 14:38:14 +00:00
Rafael Ameijeiras f13ba41e4c Merge branch 'ent-12373-API-checker-da-URL-incorrecta' into 'develop'
fix api check url

See merge request artica/pandorafms!6648
2023-11-27 14:37:24 +00:00
Jorge Rincon 5213462334 #12067 Aggregated Agents Modules and module group 2023-11-24 12:54:19 +01:00
alejandro.campos@artica.es d04a554cc7 fix api check url 2023-11-10 12:42:26 +01:00
daniel b2257ac1b1 Fix csv agent-module pandora_enterprise#12363 2023-11-03 12:12:26 +01:00
miguel angel rasteu c77686807f Fix if else 2023-11-03 10:30:25 +01:00
alejandro.campos@artica.es 5d0088b1a7 fix certificate problem in test 2023-11-02 15:27:26 +01:00
daniel 4fb7e1719b add periodicity graph pandora_enterprise#9640 2023-10-18 12:49:47 +02:00
miguel angel rasteu 5060398661 #11206 Fix conflict 2023-10-13 09:00:03 +02:00
alejandro.campos@artica.es 8cc34d2199 visual change 2023-10-10 13:24:27 +02:00
alejandro.campos@artica.es 295654d26b revert changes 2023-10-10 12:38:56 +02:00
alejandro.campos@artica.es 6a58a2e86f ip check 2023-10-10 09:10:42 +02:00
alejandro.campos@artica.es c059f83420 some changes in gotty 2023-10-09 18:56:02 +02:00
alejandro.campos@artica.es 025abbed93 add timeout 2023-10-09 14:17:16 +02:00
alejandro.campos@artica.es 780d29fce3 ssh by default 2023-10-05 09:08:20 +02:00
alejandro.campos@artica.es 17f5b0dede quick shell changes 2023-10-04 18:00:19 +02:00
alejandro.campos@artica.es 12fbd1e522 some functional changes in gotty 2023-10-02 13:57:11 +02:00
Jonathan 073639e100 #12150 add log www-error.log 2023-10-02 09:51:11 +02:00
alejandro.campos@artica.es 19a9f82fe1 gotty changes 2023-09-25 19:08:24 +02:00
Jorge Rincon 2c430929cb #11831 Fixed menu option literals 2023-09-11 16:53:52 +02:00
Pablo Aragon 0d514651b0 11878-Invalid extensions file repo 2023-08-25 13:22:39 +02:00
Pablo Aragon f221b83a9e 11878-Invalid extensions file repo 2023-08-25 13:19:23 +02:00
miguel angel rasteu fc32fcff87 #11926 Fix download CSV 2023-08-22 14:35:28 +02:00
miguel angel rasteu 9bb0b30772 #11926 Fix download CSV 2023-08-22 14:23:57 +02:00
Daniel Maya aa39f2eac2 #11926 Fixed requires 2023-08-22 12:41:30 +02:00
miguel angel rasteu b5767a696e #8285 Fix filter 2023-08-21 11:33:26 +02:00
miguel angel rasteu ec11dbab08 Merge branch 'develop' into ent-8285-exportar-a-csv-vistas-parte-2-agent-modules-view 2023-08-21 11:12:02 +02:00
Matias Didier 633370fdc1 Merge branch 'ent-11783-arbitrary-file-read-via-api-checker-page' into 'develop'
Ent 11783 arbitrary file read via api checker page

See merge request artica/pandorafms!6311
2023-08-07 10:20:59 +00:00
miguel angel rasteu 10b2b6f6f4 #11783 Fix vulneravility api checker page 2023-08-03 13:37:09 +02:00
miguel angel rasteu 9078b006ff #11505 Fix style button 2023-07-19 12:18:43 +02:00
miguel angel rasteu 3c345ed1f9 #8285 Add CSV export on agents modules view 2023-07-13 13:12:43 +02:00
Rafael Ameijeiras 48e29def9b Merge branch 'ent-10252-errata-en-la-interfaz-de-bases-de-datos-de-nodos-y-metaconsola' into 'develop'
Ent 10252 errata en la interfaz de bases de datos de nodos y metaconsola

See merge request artica/pandorafms!5696
2023-06-27 11:26:37 +00:00
miguel angel rasteu db62a91cb6 #11476 Fix https url 2023-06-08 13:19:01 +02:00
miguel angel rasteu 1f8752ee63 #11476 Fix pandora url 2023-06-08 13:10:16 +02:00
miguel angel rasteu 64204b6ff7 #11476 Fix ascci art 2023-06-08 12:42:10 +02:00
miguel angel rasteu 933f69f2ab #11476 Change copyright header 2023-06-08 11:53:13 +02:00
Pablo Aragon 94b4584d45 11521-Fix filter SNMP graph 2023-06-08 08:29:35 +02:00
Daniel Cebrian ad0dcf45d9 #10979 added grafana plugin 2023-05-31 15:34:19 +02:00