24159 Commits

Author SHA1 Message Date
Tatiana Llorente
7c73d5f51a Added confirmation to delete a visual console 2019-11-04 17:56:28 +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
Jose Gonzalez
f584ac7835 Solved issue with query 2019-11-04 17:45:56 +01:00
marcos
84bdc8fc17 add progress extend 2019-11-04 17:39:21 +01:00
Luis Calvo
7a20ec8e82 Fixed CLI delete data 2019-11-04 16:04:26 +01:00
Tatiana Llorente
e94d8726c7 Changed date in webchat 2019-11-04 13:59:30 +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
fbsanchez
a249132fb5 sap discovery - config 2019-10-31 21:32:34 +01:00
fbsanchez
aa30a12f31 wizard doc minor fix 2019-10-31 21:15:18 +01:00
fbsanchez
115c884cd4 Discovery SAP 2019-10-31 21:13:18 +01:00
fbsanchez
5a42e76650 SAP discovery task 2019-10-31 18:19:00 +01:00
fbsanchez
c72f792d43 SAP discovery task 2019-10-31 18:18:38 +01:00
alejandro-campos
a3ea32d355 fix bug in bars graph visual console editor 2019-10-31 14:12:45 +01:00
Tatiana Llorente
867ab6d0bf Fixed bug in report date 2019-10-31 09:51:38 +01:00
marcos
102ed552bd Merge branch 'ent-4772-omnishell' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4772-omnishell 2019-10-31 09:36:18 +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 Barbero Martin
7bfa076263 fixed error bbdd 2019-10-30 14:52:10 +01:00
marcos
7a937aeb3a Merge branch 'ent-4772-omnishell' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4772-omnishell 2019-10-30 14:47:36 +01:00
marcos
334cea472e add method ui_progress_extend(work in progress) 2019-10-30 14:47:28 +01:00
Daniel Barbero Martin
d37410ed8c fixed error bbdd 2019-10-30 14:43:10 +01:00
Daniel Maya
8573add0b3 Fixed agent name and error lenght 2019-10-30 13:01:59 +01:00
marcos
26f40bbeec Merge branch 'ent-4772-omnishell' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4772-omnishell 2019-10-30 10:01:58 +01:00
Daniel Barbero Martin
b7710a6562 fix remove mr34 to mr33 2019-10-30 08:04:13 +01:00
marcos
bb7ba67dab changes in omnishell.css 2019-10-29 17:49:04 +01:00
Daniel Barbero Martin
2bb81a839a Merge remote-tracking branch 'origin/ent-EDF' into ent-4772-omnishell
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/godmode/menu.php
	pandora_console/pandoradb_data.sql
2019-10-29 17:15:19 +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
marcos
487da50d31 add omnishell.css 2019-10-29 16:56:11 +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
Tatiana Llorente
898945d47f Added icon for gis maps connections in tabs of setup 2019-10-29 13:26:36 +01:00
alejandro-campos
cf0321846f fix bug in dynamic report filter group functionality: not applying recursion correctly 2019-10-29 12:31:23 +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
Daniel Barbero Martin
6ff85d2abb fixed image 2019-10-29 09:21:08 +01:00
alejandro-campos
758804e5de fix minor bug in function groups_get_id_recursive 2019-10-29 09:18:21 +01:00
Daniel Barbero Martin
6f52095419 Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico 2019-10-29 09:14:06 +01:00
Daniel Barbero Martin
f6fd5cc21f Add image feedback 2019-10-29 09:13:48 +01:00