tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
38,877 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

860 Commits

Author SHA1 Message Date
Rafael Ameijeiras 7e6a84ad45 Merge branch 'ent-13396-vista-db-schema-check-no-esta-funcionando' into 'develop' 
Ent-13396-vista-db-schema-check-no-esta-funcionando

See merge request artica/pandorafms!7168
 2024-04-17 13:55:08 +00:00
Félix Suárez 1161d77af0 Fix DB deletion when missing tables 2024-04-16 09:01:10 -06:00
Jonathan 890af1270c #13258 permisions PM for server graphs 2024-04-15 12:23:55 +02:00
Félix Suárez 8556401387 Extra validatons on Schema Check 2024-04-12 15:43:08 -06:00
Félix Suárez 32755235e9 Changes for Schema Check 2024-04-10 08:30:25 -06:00
Diego Muñoz-Reja 0b1f46932f Merge branch 'ent-12691-evitar-que-se-recargue-la-pagina-al-utilizar-filtros' into 'develop' 
Ent 12691 Evitar que se recargue la página al utilizar filtros

See merge request artica/pandorafms!7032
 2024-03-25 09:23:43 +00:00
Pablo Aragon ffce0d59a1 13094-Add columns dynamically in Agents modules view 2024-03-20 08:18:05 +01:00
Daniel Cebrian 0b419d84be #12691 added button submit in realtime_graph 2024-03-15 10:22:30 +01:00
Rafael Ameijeiras 0cce999c95 Merge branch 'ent-12695-16818-eliminar-warnings-en-console-log' into 'develop' 
Ent 12695 16818 eliminar warnings en console log

See merge request artica/pandorafms!6919
 2024-02-22 16:21:32 +00:00
Rafael Ameijeiras 28c71386e8 Merge branch 'ent-12870-Problemas-de-llenado-de-logs-con-pandora-gotty' into 'develop' 
prevent warnings

See merge request artica/pandorafms!6937
 2024-02-15 08:25:17 +00:00
Jonathan e6e98aeb39 Merge branch 'develop' into ent-12695-16818-eliminar-warnings-en-console-log 2024-02-15 09:08:25 +01:00
Enrique Martin cb63c27d2a Merge branch 'ent-12687-sistema-import-export-prd' into 'develop' 
Ent 12687 sistema import export prd

See merge request artica/pandorafms!6874
 2024-02-14 12:11:16 +00:00
alejandro.campos@artica.es a5759524a1 prevent warnings 2024-02-14 11:22:22 +01:00
Jonathan 0dcced8b53 #12695 wip removing warnings 2024-02-12 17:59:27 +01:00
Jonathan d590961e69 #12695 wip removing warnings 2024-02-09 13:51:56 +01:00
Rafael Ameijeiras 4cdea9d8ef Merge branch 'ent-12460-cientos-de-errores-en-el-log-de-apache' into 'develop' 
Ent 12460 Cientos de errores en el log de apache

See merge request artica/pandorafms!6748
 2024-02-09 09:22:48 +00:00
Jonathan 9084a34514 #12695 wip removing warnings 2024-02-08 12:31:55 +01:00
Daniel Maya 5bc20f9768 #12687 Added message prd 2024-02-07 15:01:53 +01:00
Jonathan 834635a487 Merge remote-tracking branch 'origin/ent-12460-cientos-de-errores-en-el-log-de-apache' into ent-12695-16818-eliminar-warnings-en-console-log 2024-02-07 10:39:47 +01:00
Daniel Cebrian 137488ee8c #12798 fixed unauth sql injection in grafana 2024-01-31 10:05:36 +01:00
Daniel Cebrian 5b7a123086 Merge branch 'develop' into ent-12460-cientos-de-errores-en-el-log-de-apache 2024-01-30 13:21:44 +01:00
Daniel Cebrian c0ad547625 #12460 fixed deprecated 2024-01-30 13:14:54 +01:00
Jonathan 1c094cd219 #12802 fix date error 2024-01-25 16:58:21 +01:00
Rafael Ameijeiras e19f520eb0 Merge branch 'ent-12522-mejoras-en-audit-log' into 'develop' 
Ent 12522 Mejoras en audit log

See merge request artica/pandorafms!6816
 2024-01-25 14:00:56 +00:00
Jonathan 4e523e94cc #12574 fix datepicker and give style 2024-01-24 09:51:35 +01:00
Rafael Ameijeiras 013d2119d6 Merge branch 'ent-12752-unauth-time-based-sql-injection' into 'develop' 
Ent 12752 Unauth Time-Based SQL Injection

See merge request artica/pandorafms!6861
 2024-01-23 07:38:34 +00:00
alejandro 82c8d519b4 update grafana extension 2024-01-22 13:25:43 +01:00
Daniel Cebrian ae9b786dd5 #12752 fixed sql injection 2024-01-19 09:21:57 +01:00
Daniel Cebrian 05ec992fac #12522 enhanced audit log 2023-12-27 16:05:34 +01:00
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