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

22800 Commits

Author SHA1 Message Date
manuel a486738920 Fixed visual styles ticket 4809 2019-11-06 10:31:26 +01:00
Daniel Rodriguez 868bba07b0 Merge branch 'ent-4623-Exportar-a-CSV-los-eventos-separador-erroneo' into 'develop' 
Ent 4623 exportar a csv los eventos separador erroneo

See merge request artica/pandorafms!2727
 2019-11-06 09:23:19 +01:00
Tatiana Llorente 05e424a24e Merge remote-tracking branch 'origin/develop' into ent-4623-Exportar-a-CSV-los-eventos-separador-erroneo 
Conflicts:
	pandora_console/include/functions_ui.php
 2019-11-05 17:25:56 +01:00
Tatiana Llorente 87c5d0025b Merge remote-tracking branch 'origin/develop' into ent-4623-Exportar-a-CSV-los-eventos-separador-erroneo 2019-11-05 17:24:10 +01:00
Daniel Rodriguez 35d87400fd Merge branch 'ent-4892-HTML-custom-report-date-vacio' into 'develop' 
Ent 4892 html custom report date vacio

See merge request artica/pandorafms!2847
 2019-11-05 17:19:40 +01:00
alejandro-campos 4b9d6f1ae2 fix bug in user list permission checks 2019-11-05 17:18:38 +01:00
Daniel Rodriguez f0fee8f709 Merge branch 'ent-4747-cambiar-urls-en-consola' into 'develop' 
Added docs and support urls in console. Fixed bugs

See merge request artica/pandorafms!2852
 2019-11-05 17:09:29 +01:00
Luis b707ebd4a4 Added docs and support urls in console. Fixed bugs 2019-11-05 17:09:29 +01:00
Daniel Rodriguez b7d8323583 Merge branch 'ent-3687-get-agents-id-name-by-alias-api-cli' into 'develop' 
Added API and cli function get_agents_id_by_alias

See merge request artica/pandorafms!2802
 2019-11-05 17:08:32 +01:00
Daniel Rodriguez 0f2d30698c Merge branch 'ent-4872-Cambiar-titulo-a-archivo-XML-de-los-templates-de-reports' into 'develop' 
Ent 4872 cambiar titulo a archivo xml de los templates de reports

See merge request artica/pandorafms!2862
 2019-11-05 17:03:53 +01:00
Daniel Rodriguez 0e628a365d Merge branch 'ent-4625-Cambiar-titulo-a-archivo-CSV-de-la-vista-de-eventos' into 'develop' 
Ent 4625 cambiar titulo a archivo csv de la vista de eventos

See merge request artica/pandorafms!2783
 2019-11-05 16:57:23 +01:00
Daniel Rodriguez dd86598298 Merge branch 'ent-4902-Querys-predefinidas-en-plantillas-de-informes-no-funcionan' into 'develop' 
Fixed visual bug in general report item

See merge request artica/pandorafms!2854
 2019-11-05 16:43:52 +01:00
fbsanchez ed6dd2983f Merge remote-tracking branch 'origin/ent-4752-Herramientas-de-diagnostico' into ent-EDF 
Conflicts:
	pandora_console/include/javascript/pandora.js
 2019-11-05 15:21:21 +01:00
fbsanchez 58cbc3c738 Merge remote-tracking branch 'origin/develop' into ent-EDF 
Conflicts:
	pandora_console/extras/mr/33.sql
	pandora_console/pandoradb_data.sql
 2019-11-05 15:17:09 +01:00
Daniel Barbero Martin ebb7cbfe6c Fix styles css 2019-11-05 15:12:24 +01:00
Daniel Rodriguez 01ba485401 Merge branch 'ent-4859-8959-SNMP-console-filter-warning-critical-critical-normal' into 'develop' 
fix bug in snmp console filter

See merge request artica/pandorafms!2844
 2019-11-05 14:01:35 +01:00
Luis Calvo dab4676a33 Resolved merge conflict and fixed bugs 2019-11-05 13:57:13 +01:00
Daniel Rodriguez 98d36cfc6d Merge branch 'ent-4896-General-Report-en-Plantillas-no-tiene-bien-la-hora' into 'develop' 
Ent 4896 general report en plantillas no tiene bien la hora

See merge request artica/pandorafms!2855
 2019-11-05 13:33:27 +01:00
Tatiana Llorente 945383b8ec Changed name of xml report 2019-11-05 12:43:08 +01:00
fbsanchez dc565d2575 pandora_websocket_engine installation in RPM/DEB packages 2019-11-05 12:01:58 +01:00
fbsanchez e583b71a99 missaligned tips 2019-11-05 11:51:26 +01:00
fbsanchez b1d4bfe149 Merge remote-tracking branch 'origin/develop' into ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace 
Conflicts:
	pandora_console/pandoradb_data.sql
 2019-11-05 11:16:26 +01:00
alejandro-campos 9fc635a7a9 user ack filter in event list not displaying users with all group 2019-11-05 11:03:28 +01:00
Alejandro Fraguas b409dde9c0 Merge branch 'ent-4384-cli-stop-downtime-bug' into 'develop' 
fixed fixed error on stop_downtime

See merge request artica/pandorafms!2717
 2019-11-05 11:03:02 +01:00
Daniel Rodriguez a1b879d065 Merge branch 'ent-4728-Desactivar-Restart-Map-para-usuarios-sin-permisos' into 'develop' 
Ent 4728 desactivar restart map para usuarios sin permisos

See merge request artica/pandorafms!2805
 2019-11-04 18:45:57 +01:00
Daniel Rodriguez c20b3250f4 Merge branch 'ent-4801-Error-informes-pdf-csv' into 'develop' 
Ent 4801 error informes pdf csv

See merge request artica/pandorafms!2812
 2019-11-04 18:41:03 +01:00
Tatiana Llorente c83b85c225 Ent 4801 error informes pdf csv 2019-11-04 18:41:03 +01:00
Alejandro Fraguas 777bbdd180 Merge branch '4581-sample-agent-nueva-funcionalidad' into 'develop' 
Added feature sample_agent

See merge request artica/pandorafms!2826
 2019-11-04 17:54:33 +01:00
Alejandro Fraguas 648778fffe Merge branch 'ent-4810-No-funcionan-los-templates-de-consolas-visuales' into 'develop' 
Ent 4810 no funcionan los templates de consolas visuales

See merge request artica/pandorafms!2814
 2019-11-04 12:40:04 +01:00
Tatiana Llorente 28e2702a48 Changed condition for general reports with last value checked 2019-11-04 12:00:12 +01:00
fbsanchez 123cf6e4a0 Merge branch 'ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace' into ent-EDF 2019-11-04 11:25:22 +01:00
Alejandro Fraguas cf3bcefddf Merge branch 'ent-4826-error-accesso-con-sin-acl' into 'develop' 
Fixed planned downtime acl

See merge request artica/pandorafms!2829
 2019-11-04 11:25:17 +01:00
fbsanchez a7e3614fa6 renamed ws service 2019-11-04 11:23:31 +01:00
manuel d0c2c0d1eb Fixed visual bug in general report item 2019-11-04 10:39:16 +01:00
Tatiana Llorente 867ab6d0bf Fixed bug in report date 2019-10-31 09:51:38 +01:00
fbsanchez 3eb0a6bb95 minor fixes after internal meeting 2019-10-30 18:33:33 +01:00
fbsanchez 72b1fb2b16 Merge remote-tracking branch 'origin/ent-4774-welcome-to-pandorafms' into ent-EDF 
Conflicts:
	pandora_console/include/javascript/pandora.js

	modified:   pandora_console/general/register.php
	modified:   pandora_console/godmode/agentes/configurar_agente.php
	modified:   pandora_console/godmode/agentes/module_manager_editor.php
	new file:   pandora_console/include/ajax/welcome_window.php
	new file:   pandora_console/include/class/WelcomeWindow.class.php
	modified:   pandora_console/include/constants.php
	modified:   pandora_console/include/functions_config.php
	modified:   pandora_console/include/javascript/pandora.js
	new file:   pandora_console/include/styles/new_installation_welcome_window.css
 2019-10-30 16:56:44 +01:00
Daniel Maya 8573add0b3 Fixed agent name and error lenght 2019-10-30 13:01:59 +01:00
fbsanchez c07baa614f Merge remote-tracking branch 'origin/ent-4766-feedback-de-ayudas' into ent-EDF 2019-10-29 17:00:57 +01:00
Marcos Alconada 613e5741fb Merge branch 'develop' into 'ent-4766-feedback-de-ayudas' 
# Conflicts:
#   pandora_console/include/functions_ui.php
 2019-10-29 17:00:39 +01:00
fbsanchez 383967f68a Merge branch 'ent-4769-modulos-ssh-php-perl' into ent-EDF 2019-10-29 16:56:01 +01:00
fbsanchez 0a53c0b915 Merge remote-tracking branch 'origin/ent-4752-Herramientas-de-diagnostico' into ent-EDF 2019-10-29 16:50:46 +01:00
fbsanchez 7224131126 Merge branch 'ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace' into ent-EDF 2019-10-29 16:50:02 +01:00
alejandro-campos 14230d218a fix bug in snmp console filter 2019-10-29 16:14:33 +01:00
fbsanchez f3fdcb4de0 MR update 2019-10-29 16:06:34 +01:00
fbsanchez 6478c7a51f minor tips quickshell 2019-10-29 15:55:39 +01:00
fbsanchez 06c7544041 minor fixes 2019-10-29 15:44:46 +01:00
marcos 8174b4f2eb add help option in welcome window 2019-10-29 10:38:22 +01:00
Luis Calvo 64e80e6fee Fixed error message 2019-10-29 10:32:59 +01:00
Luis Calvo 7f01f3d014 Merge remote-tracking branch 'origin/develop' into ent-3687-get-agents-id-name-by-alias-api-cli 2019-10-29 10:23:46 +01:00