Commit Graph

1596 Commits

Author SHA1 Message Date
Jose Gonzalez 38ea74ed11 Updated merge 2021-01-25 13:36:12 +01:00
Daniel Rodriguez e88ca95a8d Merge branch 'ent-6631-Bug-en-dashboard-de-usuario-sin-permiso' into 'develop'
Ent 6631 bug en dashboard de usuario sin permiso

See merge request 
2021-01-25 10:07:53 +01:00
fbsanchez bf453ab0ef Effective command preview (action) 2021-01-21 17:09:36 +01:00
alejandro-campos 9c924db8dc Merge branch 'develop' into ent-6855-Casca-netscan-custom-en-la-open 2021-01-18 10:29:06 +01:00
alejandro-campos a0931d7ada changes in dashboard permissions 2021-01-15 13:52:31 +01:00
José González 3199b3d6b5 Merge branch 'develop' into 'ent-6407-server-to-execute-snmp-browser'
# Conflicts:
#   pandora_console/include/ajax/snmp_browser.ajax.php
2021-01-07 14:14:33 +01:00
fbsanchez 6667b38729 Merge remote-tracking branch 'origin/develop' into ent-6652-pandora_db-en-historico
Conflicts:
	pandora_server/util/pandora_db.pl
2021-01-07 10:42:29 +01:00
Daniel Rodriguez b0f862b4c7 Merge branch 'ent-1175-copyright-actualizados' into 'develop'
Updated copyrights

Closes pandora_enterprise#1175

See merge request 
2020-12-23 17:19:46 +01:00
Daniel Rodriguez fc49958c96 Merge branch 'ent-6681-SNMP-Browser-multiple-remote-components-y-abrir-ventana-adicional-en-el-navegador' into 'develop'
Ent 6681 snmp browser multiple remote components y abrir ventana adicional en el navegador

See merge request 
2020-12-23 16:55:56 +01:00
Daniel Rodriguez 4f2d6bf136 Merge branch 'ent-6799-Edicion-Dashboards-fallo-al-cambiar-ancho-widgets' into 'develop'
Fix gridstack js version 1.2

See merge request 
2020-12-23 11:47:07 +01:00
José González 02475d25b6 Merge branch 'develop' into 'ent-1175-copyright-actualizados'
# Conflicts:
#   pandora_console/general/header.php
#   pandora_console/general/sap_view.php
2020-12-23 06:48:22 +01:00
alejandro-campos f03b4e59f8 several fixes in netscan custom 2020-12-18 11:40:22 +01:00
daniel b230e17cc2 fix report groups status metaconsole 2020-12-17 17:04:52 +01:00
José González 623b729001 Merge branch 'develop' into 'ent-1175-copyright-actualizados'
# Conflicts:
#   pandora_agents/pc/Win32/pandora_agent.conf
#   pandora_agents/win32/bin/pandora_agent.conf
#   pandora_console/extensions/realtime_graphs.php
#   pandora_console/godmode/snmpconsole/snmp_alert.php
#   pandora_console/include/functions_ui.php
#   pandora_console/install.php
#   pandora_console/operation/agentes/realtime_win.php
2020-12-14 11:10:35 +01:00
alejandro-campos 092011916b fix recursivity check 2020-12-10 16:07:40 +01:00
Daniel Rodriguez 4b51e26086 Merge branch 'ent-4231-crear-plugin-para-google-cloud-y-anadirlo-a-discovery' into 'develop'
discovery.cloud.gcp

See merge request 
2020-12-09 13:54:25 +01:00
Daniel Maya 244c4d56d6 Fixed unit 2020-12-04 12:32:38 +01:00
Daniel Rodriguez 9aaae58cc7 Merge branch 'ent-2323-Modo-Debug-instantáneo' into 'develop'
Added QueryResult ui type

See merge request 
2020-12-03 14:43:44 +01:00
Luis 50b1fa3c56 Changed check connection method to ajax. Check deleted from login 2020-12-03 12:27:55 +01:00
Daniel Barbero Martin 3592368a3c Fix gridstack js version 1.2 2020-12-02 14:26:20 +01:00
Jose Gonzalez f2a94b9aa5 Merge 2020-12-02 11:38:22 +01:00
Jose Gonzalez eeac1ca35e Merge 2020-12-02 11:28:46 +01:00
Marcos Alconada f72d924f1e ticket 6435 2020-12-02 10:10:34 +01:00
fbsanchez eb67b387b9 Merge remote-tracking branch 'origin/develop' into ent-4231-crear-plugin-para-google-cloud-y-anadirlo-a-discovery
Conflicts:
	pandora_console/include/class/CredentialStore.class.php
2020-12-01 17:32:02 +01:00
Luis 734341bf2d Ent 6148 new report permissions 2020-11-30 14:52:03 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
Jose Gonzalez 9bf70add51 Fixed snmp server selection 2020-11-26 10:35:48 +01:00
Daniel Rodriguez 80b60d101c Merge branch 'ent-6157-Fallos-en-servicios-dinamicos' into 'develop'
Added new js file

Closes pandora_enterprise#6157

See merge request 
2020-11-25 10:35:47 +01:00
Jose Gonzalez 063bf967f4 Added new js file 2020-11-20 10:24:15 +01:00
José González 32dcd8a7ca Merge branch 'develop' into 'ent-6398-Poner-ojito-mostrar-passwords'
# Conflicts:
#   pandora_console/include/javascript/pandora_ui.js
2020-11-19 15:21:58 +01:00
fbsanchez d08aa0b32b Updates in parent relationship ** WARN: bad relation line move while other lines are attached 2020-11-12 18:25:16 +01:00
fbsanchez 14db9c63c6 Sticky lines (VC) 2020-11-12 16:57:14 +01:00
Daniel Maya 0ea8196db0 Fixed create network components 2020-11-12 13:44:52 +01:00
fbsanchez b8437bec79 Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red 2020-11-11 11:09:30 +01:00
fbsanchez 067a19f69b WIP sticky lines 2020-11-06 20:37:37 +01:00
Luis 2f2556ef79 Ent 6680 ventana de perdida de conexion incorrecta 2020-11-04 16:41:25 +01:00
fbsanchez c59042c034 WIP 2020-11-03 18:01:24 +01:00
fbsanchez b585a4e372 Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red 2020-11-03 16:35:25 +01:00
fbsanchez d85c1ace3c WIP network links VC 2020-11-03 16:35:11 +01:00
daniel c4e7c6b5f1 fix events acknowledge-by 2020-10-30 14:42:10 +01:00
fbsanchez 90f199c5ad WIP NetworkLink 2020-10-30 14:07:44 +01:00
daniel 4e2d5bdf2b fix counter groups child 2020-10-30 13:23:47 +01:00
fbsanchez 326d1dac49 Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red 2020-10-30 10:38:30 +01:00
Marcos Alconada 8e4c62a0e9 fixed error 2020-10-29 18:20:33 +01:00
fbsanchez 8e09a30a05 WIP Networklink POC 2020-10-29 17:20:16 +01:00
Daniel Rodriguez 0a24fedb5a Merge branch 'ent-6606-mostrar-descripcion-de-servicios-en-vista-de-arbol' into 'develop'
Use service description instead of name in tree view

See merge request 
2020-10-28 11:19:49 +01:00
alejandro-campos 6ff11239e4 fixed connection check in public link of visual consoles 2020-10-26 14:44:05 +01:00
Kike 3287223b4d Use service description instead of name in tree view 2020-10-26 12:05:37 +01:00
Jose Gonzalez 3b14453d1e WIP: Added QueryResult ui type 2020-10-08 13:47:26 +02:00
fbsanchez 2187f9d0c9 Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.item_editor.php
2020-10-02 14:56:07 +02:00
daniel 0db539c444 fix visual windows charts 2020-10-01 15:29:54 +02:00
fbsanchez 5f4893ef1a Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos 2020-09-29 12:47:11 +02:00
Jose Gonzalez 00b289a557 Adapt functions for work in Metaconsole 2020-09-29 12:21:52 +02:00
Jose Gonzalez 6a21a668bf Added control for reveal passwords 2020-09-29 09:44:20 +02:00
Manuel Montes f78ae89a99 Ent 6177 mejoras para el public link de dashboards 2020-09-24 16:20:13 +02:00
fbsanchez 9ce54213b6 WIP GCP 2020-09-23 14:07:23 +02:00
Jose Gonzalez 0e3c10a698 Merge 2020-09-17 10:35:18 +02:00
fbsanchez 3374a89ae0 Group selection improvement 2020-09-11 14:34:41 +02:00
alejandro-campos 0917a631ee fix parameter macros in event responses 2020-08-14 14:48:34 +02:00
alejandro-campos 8f96ca0805 fix parameter macros in event responses 2020-08-13 14:13:12 +02:00
alejandro-campos 90ea61f753 fix parameter macros in event responses 2020-08-13 14:10:57 +02:00
Luis 3327abc328 Ent 5824 connection lost warn mejora 2020-07-31 14:24:02 +02:00
daniel fdad32e4f0 Add public link dashboards 2020-07-22 10:56:16 +02:00
daniel bd1c6b95ec Add agent/module view in dashboard 2020-07-17 10:33:40 +02:00
Daniel Rodriguez 846fd10ce1 Merge branch 'ent-5824-connection-lost-warn' into 'develop'
Ent 5824 connection lost warn

See merge request 
2020-07-14 18:10:11 +02:00
Daniel Rodriguez 76828ba745 Merge branch 'ent-5769-borrado-de-eventos-no-pide-confirmacion' into 'develop'
Ent 5769 borrado de eventos no pide confirmacion

See merge request 
2020-07-14 11:04:03 +02:00
fbsanchez 3d493f14da massive services 2020-07-07 19:10:24 +02:00
fbsanchez 53a2215a41 minor fix 2020-07-06 14:01:51 +02:00
fbsanchez 2442336f45 Minor fix 2020-07-06 13:58:35 +02:00
Luis Calvo d3087de163 Merge remote-tracking branch 'origin/develop' into ent-5824-connection-lost-warn 2020-07-06 10:49:24 +02:00
fbsanchez 112f578512 wip smart services 2020-07-01 20:50:07 +02:00
fbsanchez faaf14bfd4 Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos
Conflicts:
	pandora_console/extras/mr/39.sql
	pandora_console/include/lib/Module.php
2020-06-30 17:04:33 +02:00
José González 311b259684 Backup upload 2020-06-30 12:16:51 +02:00
fbsanchez 032faf8c0c WIP Smart services 2020-06-26 15:48:58 +02:00
Daniel Rodriguez 7f1bd68c26 Merge branch 'ent-5865-9984-Error-al-realizar-SNMPWalk-en-consola-con-v3-y-caracteres-especiales' into 'develop'
fixed ajax call params when using url characters

See merge request 
2020-06-26 12:41:25 +02:00
Daniel Rodriguez 3c5a893c71 Merge branch 'ent-5830-SNMP-Browser-Network-components-OID-info-and-Create-agent-modules' into 'develop'
Ent 5830 snmp browser network components oid info and create agent modules

See merge request 
2020-06-24 12:46:49 +02:00
fbsanchez 166978f3aa Merge remote-tracking branch 'origin/develop' into ent-5759-intervalo-de-oracle-discovery-sale-mal 2020-06-22 12:25:04 +02:00
Luis Calvo d346c76322 Connection error dialog working 2020-06-19 23:03:37 +02:00
Luis Calvo e56a787ba8 WIP: Connection lost warn 2020-06-18 20:41:14 +02:00
alejandro-campos 53b3cb8925 Merge branch 'develop' into ent-5865-9984-Error-al-realizar-SNMPWalk-en-consola-con-v3-y-caracteres-especiales 2020-06-15 17:10:17 +02:00
daniel b9d5ab9c4a Fixed errors new tab base64 image 2020-06-08 11:24:46 +02:00
marcos 07593e4466 fixed code 2020-06-04 14:00:30 +02:00
marcos 67d5a28346 add confirm dialog on meta and node recursive 2020-06-04 13:50:36 +02:00
marcos 4904718c41 add confirm dialog when delete one item in events table 2020-06-04 11:08:51 +02:00
fbsanchez b3cf532c16 Merge remote-tracking branch 'origin/develop' into ent-5756-pantallas-de-configuracion-del-cluster 2020-05-29 12:30:49 +02:00
fbsanchez bb9f878816 Integer comparison when available 2020-05-29 11:47:37 +02:00
fbsanchez d8613131bd Integer comparison when available 2020-05-29 11:22:47 +02:00
fbsanchez f7ca97f7ef Chrome particularity 2020-05-29 11:12:13 +02:00
alejandro-campos 8abd447af1 minor fix in snmp browser 2020-05-27 16:11:48 +02:00
fbsanchez e8a3cb698d Time selector adjustment 2020-05-26 11:26:49 +02:00
alejandro-campos b9877a9cf6 fixed ajax call params when using url characters 2020-05-26 11:05:53 +02:00
fbsanchez 7bc9a96524 Minor fixes 2020-05-25 18:18:38 +02:00
fbsanchez 523212afb8 WIP cluster view 2020-05-20 19:04:42 +02:00
Daniel Rodriguez 96947d32fc Merge branch 'ent-5807-Bugs-al-eliminar-widget-y-visual-con-nuevos-Dashboards' into 'develop'
Fixed errors in dashboards

See merge request 
2020-05-19 08:23:37 +02:00
fbsanchez 585f0f011e WIP cluster rebuild 2020-05-14 17:49:02 +02:00
Daniel Rodriguez 5cab51c99d Merge branch 'ent-5554-Creador-de-mapas-de-red-se-vuelve-inoperable-despues-de-borrar-un-nodo' into 'develop'
fix accessing wrong index after deletion of node

See merge request 
2020-05-12 12:59:12 +02:00
Tatiana Llorente fabace239d Ent 5675 textos del sistema de licencias 2020-05-12 12:54:20 +02:00
Daniel Barbero Martin 24f4f68b33 Fixed errors in dashboards 2020-05-11 14:50:13 +02:00
Tatiana Llorente 1f16abd4bd Ent 5701 quitar feature de chat 2020-05-08 15:39:24 +02:00
Daniel Rodriguez fbd9902dc7 Merge branch 'ent-5746-problema-libreria-de-modulos' into 'develop'
add cache false on functions_module_library

See merge request 
2020-05-08 15:36:44 +02:00
fbsanchez bd3ffc0c8d Tree view style review 2020-05-06 17:35:05 +02:00
fbsanchez 92ff713651 1st approach 2020-05-05 18:58:45 +02:00
marcos e215cdc194 add cache false on functions_module_library 2020-04-30 18:20:09 +02:00
marcos 72f9c051eb changed message confirmation dialog 2020-04-28 10:44:13 +02:00
marcos 8cd1c0b83f add body message on confirmation modal 2020-04-28 10:12:20 +02:00
marcos ccd58897ee Add confirmation window 2020-04-27 16:40:50 +02:00
Daniel Maya 8ae8ac45f5 Ent 5690 vulnerabilidad critica inyeccion de comandos en llamada a event response 2020-04-15 15:50:08 +02:00
fbsanchez 72d20a6e57 Merge remote-tracking branch 'origin/develop' into ent-5575-wizard-de-modulos-y-recon-by-steps
Conflicts:
	pandora_console/godmode/wizards/DiscoveryTaskList.class.php
2020-04-07 12:55:27 +02:00
marcos 3a688c6b3d update task list dialog 2020-04-06 12:29:37 +02:00
marcos ad4781eb3c fixed error with dialog task list 2020-04-03 12:48:52 +02:00
fbsanchez acabe543c4 csv recon0 2020-03-30 19:44:44 +02:00
fbsanchez 3a74e25068 PEN management 2020-03-27 11:41:56 +01:00
alejandro-campos 26c16adbf9 fix accessing wrong index after deletion of node 2020-03-27 11:37:10 +01:00
fbsanchez e48ef76f35 merge 2020-03-26 14:38:23 +01:00
daniel 709201bf23 dashboards 2020-03-26 12:29:38 +01:00
fbsanchez 6504fe49b5 intentation to spaces (2) and minor fix 2020-03-18 10:28:50 +01:00
fbsanchez b860c49383 target selections 2020-03-17 18:34:30 +01:00
fbsanchez f3da919abc WIP multiple changes 2020-03-16 23:52:20 +01:00
fbsanchez ce11d89953 Frontent changes 2020-03-13 14:03:50 +01:00
Luis 82fe47cfd9 Ent 5312 snmp browser enchancements 2020-02-27 16:31:09 +01:00
Tatiana Llorente ec57540fb0 Ent 5432 libreria de modulos de pandora integrada en consola 2020-02-27 11:20:24 +01:00
Daniel Barbero Martin a55e431b46 Fixed error cache build link VC 2020-02-20 13:25:56 +01:00
Alejandro Fraguas 1acfaa9cdc Merge branch 'ent-5429-Cambios-en-el-editor-de-modulos' into 'develop'
Ent 5429 cambios en el editor de modulos

See merge request 
2020-02-18 14:03:36 +01:00
alejandro-campos 526ba37151 minor visual change in threshold graph 2020-02-11 10:10:03 +01:00
alejandro-campos 58364f90d5 visual changes in module creation 2020-02-07 14:01:59 +01:00
alejandro-campos bc96e0b32a visual changes in module creation 2020-02-07 13:59:50 +01:00
Luis 56a2970755 Ent 5112 error nodos ficticios widget mapa red 2020-02-06 14:32:43 +01:00
Daniel Barbero Martin e49ed85d03 fixed errors VC 2020-01-28 18:29:32 +01:00
Daniel Barbero Martin 570ebd9a0a fixed errors VC 2020-01-27 13:16:01 +01:00
Daniel Barbero Martin 5ff10ac514 fixed errors VC 2020-01-25 11:57:04 +01:00
Daniel Barbero Martin fe697a98ec fixed errors VC 2020-01-23 19:54:47 +01:00
Daniel Barbero Martin 481f08bd5f fixed errors VC 2020-01-23 16:21:31 +01:00
Daniel Barbero Martin 3124e09c12 fixed errors VC 2020-01-23 09:20:40 +01:00
Daniel Barbero Martin 6c6403336f Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-23 08:14:24 +01:00
Daniel Barbero f3dbf6391f Add confirm dialog remove item VC 2020-01-22 13:00:19 +01:00
Daniel Barbero 69e750da13 Fixed error Color cloud VC 2020-01-22 12:48:31 +01:00
Daniel Maya 32b28bea0c Added warning in update manager offline 2020-01-22 11:10:02 +01:00
Daniel Barbero Martin ac4c091c9e Fixed errors VC 2020-01-21 17:43:41 +01:00
Daniel Barbero Martin a557c25c31 Fixed errors VC 2020-01-21 12:55:54 +01:00
Daniel Barbero Martin 578400aa92 change load modal ?????? 2020-01-21 08:37:30 +01:00
Daniel Barbero Martin 89e83e38e0 Merge remote-tracking branch 'origin/develop' into new-vc-line-element
Conflicts:
	pandora_console/include/javascript/pandora.js
2020-01-21 08:28:00 +01:00
Daniel Barbero Martin 98ddf3c6ee Fixed errors VC 2020-01-20 17:46:52 +01:00
Daniel Barbero Martin 3545e28581 Fixed errors VC 2020-01-20 16:01:53 +01:00
Alejandro Campos e7769b8bf4 Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024'
# Conflicts:
#   pandora_console/extras/mr/35.sql
2020-01-20 12:00:42 +01:00
Daniel Rodriguez 738361d237 Merge branch 'ent-4876-pandora_ui.js' into 'develop'
first changes pandora.js to pandora_ui.js

See merge request 
2020-01-20 09:54:20 +01:00
Daniel Barbero Martin 861011257d Fixed errors VC 2020-01-19 22:57:31 +01:00
Daniel Barbero Martin d5e21499c2 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-16 14:08:07 +01:00
Tatiana Llorente 0980c9a74a Ent 5261 cambio de control de intervalo en alertas 2020-01-16 13:50:39 +01:00
Daniel Barbero Martin d8a09bf359 Fixed errors VC 2020-01-15 17:37:24 +01:00
alejandro-campos d9062def99 Merge branch 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024' of https://brutus.artica.es:8081/artica/pandorafms into ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024 2020-01-15 16:01:11 +01:00
alejandro-campos 3f26f2ef6f fix bug when deleting custom units and changed default value for byte multiplier 2020-01-15 16:00:33 +01:00
Daniel Barbero 89b43f1aee loading on resize and update elements VC 2020-01-14 15:52:47 +01:00
Daniel Barbero ed53399c3c Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-14 09:34:31 +01:00
Tatiana Llorente 7c928b8100 Ent 4795 check seleccionar todos queda marcado 2020-01-14 08:37:04 +01:00
Daniel Barbero Martin 602ce39907 Fixed clock item VC 2020-01-13 17:13:52 +01:00
Daniel Barbero Martin 09f1e2b733 fixed errors in resize and move item percentile and value 2020-01-13 09:53:00 +01:00
Daniel Barbero Martin d4b92a6913 Fixed errors in VC 2020-01-10 13:48:07 +01:00
Daniel Barbero Martin f34387b24e Fixed modal send more forms 2020-01-10 08:41:07 +01:00
Daniel Barbero Martin d97cdfbc7a fix element line 2020-01-08 17:28:03 +01:00
Daniel Barbero Martin c4f0305f9b Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-08 08:29:59 +01:00
Daniel Barbero Martin da01883902 Fixed items vc line 2020-01-07 18:07:07 +01:00
Daniel Barbero Martin b49dd76ce4 Add images input 2020-01-07 15:43:44 +01:00
vgilc 996d322d5d Merge branch 'ent-5176-metaconsola-informes-tipo-texto' into 'develop'
Fixed visual bug in text report item

See merge request 
2020-01-07 10:17:10 +01:00
Daniel Rodriguez 0c2c7d9f3b Merge branch 'ent-2813-Muestra-de-información-en-el-tree-view' into 'develop'
Added stopPropagation

See merge request 
2020-01-07 09:24:38 +01:00
manuel 4214a32fb7 Fixed visual bug in text report item 2019-12-24 10:11:27 +01:00
Daniel Barbero d4207ef67c Fixed form php VC 2019-12-20 13:58:47 +01:00
Daniel Barbero 14984faaaa Fixed errors Form VC 2019-12-19 20:42:29 +01:00
Daniel Barbero 7d60287018 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2019-12-19 08:02:47 +01:00
Daniel Barbero 9b4f12a875 Fixed forms VC 2019-12-18 17:36:01 +01:00
Daniel Maya 7f1245e09d Fixed mceLast class 2019-12-18 10:23:27 +01:00
Daniel Barbero 2a92c9d38d Fixed errors VC forms 2019-12-17 10:57:19 +01:00
Daniel Barbero 9e01cb097c Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2019-12-13 13:02:04 +01:00
Daniel Barbero 603b4e71eb Fix gauge pdf reports 2019-12-13 09:06:54 +01:00
Daniel Barbero 319b3e604f Merge remote-tracking branch 'origin' into new-vc-line-element 2019-12-13 08:15:23 +01:00
Manuel Montes a2162948b4 Fixed minor bugs in metaconsole reports 2019-12-12 18:12:42 +01:00
Daniel Barbero 63dd3c48f8 Merge remote-tracking branch 'origin/develop' into new-vc-line-element
Conflicts:
	pandora_console/include/javascript/pandora.js
2019-12-12 16:32:32 +01:00
manuel 2504a3dc09 Fixed bug in module creation view 2019-12-12 13:50:35 +01:00
vgilc 1b2d4e233a Merge branch 'ent-5006-Bug-al-eliminar-un-nodo-de-un-mapa-de-red-y-mover-otro-elemento' into 'develop'
Ent 5006 bug al eliminar un nodo de un mapa de red y mover otro elemento

See merge request 
2019-12-10 11:30:28 +01:00
Daniel Maya 2b8e9995ce Added stopPropagation 2019-12-04 17:14:45 +01:00
marcos a67b0a9978 update pandora.js pandora_ui.js 2019-11-28 18:27:05 +01:00
marcos e84610120b Add coments in pandora_ui.js 2019-11-27 11:43:50 +01:00
Marcos Alconada 888988572a Merge branch 'develop' into 'ent-4876-pandora_ui.js'
# Conflicts:
#   pandora_console/include/javascript/pandora.js
2019-11-27 11:39:11 +01:00
Jose Gonzalez d181d5357b Created function for initialize TinyMCE 2019-11-26 13:19:28 +01:00
Jose Gonzalez b65200fde6 Solved issue with TinyMCE status bar. Now can view it properly 2019-11-22 10:17:16 +01:00
daniel 960326b980 Add menu omnishell 2019-11-21 18:21:46 +01:00
Tatiana Llorente d392978a70 Fixed bug when deleting nodes in network maps 2019-11-21 17:28:58 +01:00
marcos 1640c03fc3 first changes pandora.js to pandora_ui.js 2019-11-21 16:42:39 +01:00
Daniel Barbero Martin 67fb2216d4 Fix 2019-11-20 09:48:35 +01:00
fbsanchez 53954ec853 Merge branch 'ent-4774-welcome-to-pandorafms' into ent-EDF 2019-11-11 14:26:23 +01:00
fbsanchez 65f5223698 validation alerts 2019-11-11 14:26:04 +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 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 
2019-11-04 18:45:57 +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
fbsanchez 383967f68a Merge branch 'ent-4769-modulos-ssh-php-perl' into ent-EDF 2019-10-29 16:56:01 +01:00
marcos 57bfc364ae add modal confirmation window 2019-10-28 18:57:10 +01:00
fbsanchez 7d5b845e1f minor fixes 2019-10-28 18:37:01 +01:00
Daniel Barbero c4aea1ac59 add styles validation form of modal 2019-10-25 13:28:01 +02:00
Daniel Barbero Martin 3dee6888d6 fix 2019-10-24 17:42:37 +02:00
Daniel Barbero Martin de22fb70e3 Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico 2019-10-23 19:51:49 +02:00
Daniel Barbero Martin f06a55c6bb continue feedback mail 2019-10-23 19:50:57 +02:00
Daniel Maya c01a856826 Changed color 2019-10-23 11:17:16 +02:00
marcos 353246f9f6 first changed to welcome window 2019-10-18 10:30:19 +02:00
Daniel Barbero Martin 4e56f6751a Continue work diagnostics 2019-10-17 15:17:28 +02:00
Tatiana Llorente dd2ace99e1 Check permissions to reset a network map - 2019-10-11 13:51:52 +02:00
fbsanchez 722ba58085 more comprehensible vc form display flow 2019-10-03 11:04:13 +02:00
fbsanchez 79dca2fe6b Php OO form load 2019-10-02 18:37:50 +02:00
Daniel Barbero Martin c5022fc243 continue VC 2019-10-02 12:28:17 +02:00
marcos.alconada a44e1feeb4 fixed error comments events 2019-10-01 16:24:02 +02:00
Daniel Barbero d35a5d4f71 continue VC form create items 2019-09-27 15:44:39 +02:00
Daniel Barbero Martin 8258e1f446 add css form VC 2019-09-26 15:26:00 +02:00
Daniel Barbero Martin cd5fd4782c Merge remote-tracking branch 'origin/develop' into new-vc-line-element
Conflicts:
	pandora_console/include/visual-console-client/vc.main.css
2019-09-24 13:20:25 +02:00
Daniel Barbero Martin c9f15e877d continue VC 2019-09-24 13:18:34 +02:00
fbsanchez 7d52614064 Ent 4615 implementar cifrado en los contenedores de credenciales usando el sistema de cifrado interno de pandora 2019-09-24 11:25:53 +02:00
Daniel Barbero Martin 50c37e56c9 continue VC 2019-09-23 19:16:36 +02:00
Daniel Barbero fc024898ef continue VC 2019-09-22 20:35:51 +02:00
Daniel Barbero 034bbff2cf continue VC 2019-09-20 15:14:26 +02:00
Daniel Barbero Martin 716c79fc3e continue VC 2019-09-19 17:47:41 +02:00
Daniel Barbero Martin 46fdfc4445 fixed autocomplete agent 2019-08-22 10:11:06 +02:00
Daniel Barbero Martin ee1eed93b4 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2019-08-21 07:58:08 +02:00
Daniel Barbero Martin e537cd09f4 Fixed errors 2019-08-19 12:32:38 +02:00
Daniel Barbero Martin c6b6566048 fixed errors 2019-08-14 14:31:41 +02:00
Alejandro Gallardo Escobar dbf141d866 Improved the movement of the visual console line element 2019-08-14 14:24:06 +02:00
fbsanchez adbb48ab87 pandora HA review 2019-08-10 02:13:01 +02:00
Daniel Barbero Martin 0bc8fc72cb add new input group image 2019-08-05 14:58:27 +02:00
Daniel Barbero Martin ed2d57aa4e Add new input group visual console linked 2019-08-02 12:24:47 +02:00
Daniel Maya 2030c0beee added copy an item 2019-07-31 13:23:25 +02:00
Daniel Barbero Martin ade9345a74 Add select group form VC 2019-07-31 11:03:13 +02:00
Daniel Barbero Martin a581a4b1ac add new input group parent linked 2019-07-30 14:58:01 +02:00
Daniel Maya 8845fc9330 item deletion improvements 2019-07-30 11:20:03 +02:00
Alejandro Gallardo Escobar 9918cc7249 Added async data request to the input groups of the visual console items 2019-07-29 15:31:13 +02:00
Alejandro Gallardo Escobar a8ce05d5c3 Merge branch 'new-vc-line-element' of https://brutus.artica.lan:8081/artica/pandorafms into new-vc-line-element 2019-07-29 11:33:20 +02:00
Daniel Maya f7ab47e637 Fixed delete item 2019-07-26 14:17:14 +02:00
Daniel Maya 5067462620 Added remove item 2019-07-25 17:58:37 +02:00
Alejandro Gallardo Escobar 30491a307c Bugfixes 2019-07-24 16:38:00 +02:00
fbsanchez 8d9c4682c7 WIP Agent repository 2019-07-17 20:37:13 +02:00
Alejandro Gallardo Escobar 67b376466b Great improvements into the edition of the visual console items 2019-07-16 16:27:23 +02:00
Alejandro Gallardo Escobar 39d02db364 Merge branch 'new-vc-line-element' of https://brutus.artica.lan:8081/artica/pandorafms into new-vc-line-element 2019-07-12 14:04:55 +02:00
Alejandro Gallardo Escobar 3120058c36 Added item selection and a WIP version of the edition form 2019-07-12 14:00:24 +02:00
Daniel Maya d060468361 Added spinner 2019-07-12 11:00:11 +02:00
Tatiana Llorente 1f8e143963 Fixed bug to change the event status in modal window - 2019-07-10 13:04:06 +02:00
Tatiana Llorente bfb7897149 Added success and error messages when change the event status - 2019-07-10 12:15:41 +02:00
Tatiana Llorente 8c7745768c Added success and error messages when change the event owner - 2019-07-10 11:05:06 +02:00
Tatiana Llorente 936a7e839f Added success and error messages when change the event owner - 2019-07-09 17:18:37 +02:00
Daniel Maya 8047bf2c87 Added isUpdating 2019-07-09 16:43:23 +02:00
Tatiana Llorente 084d1a229e Added success and error messages when change the event owner - 2019-07-09 16:41:00 +02:00
Daniel Barbero 127f67f2ac fixed error in network component 2019-07-08 19:33:54 +02:00
Daniel Maya aafba795ee Update visual console 2019-07-08 17:51:01 +02:00
Daniel Barbero b70c904ec3 fixed minor error network components 2019-07-08 13:40:52 +02:00
Daniel Barbero 6e7dfb38fd fixed error network component plugin 2019-07-05 13:46:48 +02:00
Alejandro Fraguas 3a76f331c8 Merge branch 'ent-2094-Añadir-buscador-en-operaciones-masivas' into 'develop'
Add module filter by text -#2094

See merge request 
2019-07-02 11:37:01 +02:00
Alejandro Fraguas 47838a1134 Merge branch 'ent-4213-SNMP-Walk-dede-modulo-creado-no-muestra-parametros-v3' into 'develop'
Ent 4213 snmp walk dede modulo creado no muestra parametros v3

See merge request 
2019-07-01 09:48:33 +02:00
Daniel Rodriguez 4136f19190 Merge branch 'ent-4258-visual-console-movement-redimension-mode' into 'develop'
Visual Console's movement and redimension mode

See merge request 
2019-06-26 13:06:02 +02:00
Daniel Rodriguez 61e07abf3a Merge branch 'ent-4238-eventos-csv-e-historico' into 'develop'
Ent 4238 eventos csv e historico

See merge request 
2019-06-25 18:33:49 +02:00
fbsanchez 8f914b69a6 Minor fixes 2019-06-25 17:24:16 +02:00
fbsanchez 96ca26dc97 minor fix in event mass response process 2019-06-25 16:05:56 +02:00
Daniel Rodriguez 01514ba5b6 Merge branch 'ent-3699-descuadre-visual-recuperar-password' into 'develop'
Ent 3699 descuadre visual recuperar password

See merge request 
2019-06-25 14:26:57 +02:00
fbsanchez 1966c81f2d Merge remote-tracking branch 'origin/develop' into ent-4238-eventos-csv-e-historico 2019-06-25 14:10:32 +02:00
Daniel Rodriguez c5be8e55ae Merge branch 'ent-3807-html-special-chars-conversion' into 'develop'
Ent 3807 html special chars conversion

See merge request 
2019-06-25 12:19:01 +02:00
Alejandro Gallardo Escobar d9fee539a8 Merge branch 'develop' into 'ent-4258-visual-console-movement-redimension-mode'
# Conflicts:
#   pandora_console/include/visual-console-client/vc.main.css
2019-06-24 10:31:53 +02:00
fbsanchez 526ebdebd9 ajax comments 2019-06-20 21:11:56 +02:00
Daniel Maya 71ea94eea3 Fixed item save 2019-06-20 16:36:24 +02:00
Daniel Maya e182997308 Merge branch 'ent-3994-Añadir-actualización-de-ciertos-valores-a-la-api-web-de-la-consola-visual' into ent-3997-anadir-posicionamiento-a-los-elementos-de-la-consola-visual 2019-06-20 11:40:33 +02:00
Tatiana Llorente 988eb2e257 Add module filter by text -#2094 2019-06-19 17:36:55 +02:00
fbsanchez 8b8d17f089 event ajax validation little improvement 2019-06-18 18:35:34 +02:00
fbsanchez 24025ebb74 Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles 2019-06-18 17:48:03 +02:00
fbsanchez a1f004fdec minor fixes 2019-06-18 15:03:49 +02:00
fbsanchez 22272225b8 massive operations over events 2019-06-18 14:26:55 +02:00
fbsanchez dc81d168e0 event filters group selectors 2019-06-18 11:00:48 +02:00
fbsanchez f7cf6e1e8b wip events 2019-06-18 10:32:04 +02:00
Daniel Maya 589000fb6c Added save in onItemMoved 2019-06-18 10:13:56 +02:00
fbsanchez a8a206fa10 events 2019-06-17 19:12:45 +02:00
fbsanchez 457c1c9edf wip event view 2019-06-17 18:33:39 +02:00
fbsanchez ab7d72a1c9 wip event vwr ui-box close tick 2019-06-17 17:02:33 +02:00
Luis Calvo 08c035a612 Refactorf SNMPBrowserWndow in one unique function 2019-06-17 16:33:57 +02:00
Daniel Rodriguez a583da3de3 Merge branch 'ent-3992-anadir-el-modo-de-edicion-a-la-vista-de-la-consola-visual' into 'develop'
Añadir el modo de edición a la vista de la consola visual

Closes pandora_enterprise#3981

See merge request 
2019-06-17 15:07:12 +02:00
Alejandro Gallardo Escobar dbf15a759f Added a functionality to allows the live vc item resizement 2019-06-17 12:22:55 +02:00
fbsanchez 36a1387632 WIP event show info 2019-06-14 19:23:04 +02:00
fbsanchez 132076198d minor fixes and event ACL - groups 2019-06-14 13:20:34 +02:00
fbsanchez 23d09a3c46 wip massive event operations 2019-06-13 20:09:55 +02:00
fbsanchez b08e8b595d multiple fixes 2019-06-13 19:41:21 +02:00
fbsanchez 0df48675f3 event deletion 2019-06-13 16:28:26 +02:00
fbsanchez 029d3b073f Avoid double validation, avoid redraw 2019-06-13 13:52:38 +02:00
fbsanchez 0afb53dc17 fix in time comparison while validating events 2019-06-13 13:35:02 +02:00
fbsanchez 9740275388 dyn redraw 2019-06-13 13:07:11 +02:00
fbsanchez d12773cfd0 Avoid double validation, avoid redraw 2019-06-13 12:36:31 +02:00
fbsanchez ecc2fef8f6 event validation/in process 2019-06-13 12:30:09 +02:00
fbsanchez f3a0f37a1c Events agent grouped 2019-06-12 18:19:39 +02:00
fbsanchez 4bb300889d Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles 2019-06-12 13:17:36 +02:00
fbsanchez b615b50920 wip event grouped 2019-06-12 13:17:18 +02:00
Alejandro Gallardo Escobar ee7fb4db5f Merge branch 'develop' into ent-3997-anadir-posicionamiento-a-los-elementos-de-la-consola-visual 2019-06-12 12:13:48 +02:00
Alejandro Gallardo Escobar 7307d34c75 Minor fix 2019-06-11 17:39:46 +02:00
Alejandro Gallardo Escobar 5735326430 Added an async task to persist the visual console item movement to the database 2019-06-11 17:27:22 +02:00
Alejandro Fraguas cb6d71b930 Merge branch 'ent-3474-Exportar-a-csv-custom-field-view' into 'develop'
Ent 3474 exportar a csv custom field view

See merge request 
2019-06-11 17:06:14 +02:00
Alejandro Gallardo Escobar 9d15ece41a Added an event handler for move events of the visual console items 2019-06-11 16:44:19 +02:00
fbsanchez 48e6fef0b7 Event filters 2019-06-11 12:58:18 +02:00
marcos.alconada 73466b9096 Node deleted disapear in tree view 2019-06-06 18:47:10 +02:00
fbsanchez 23e6711f09 WIP Events 2019-06-06 17:50:47 +02:00