fd23ed30c5
Merge remote-tracking branch 'origin/develop' into ent-4176-8084-8169-actualizacion-selenium-firefox-wux
2020-03-04 11:37:35 +01:00
d799ac0739
Added pagination and filter box in alert actions - #5365
2020-03-02 16:17:45 +01:00
c8e492b194
Moved creation button to right side in visual maps - #5404
2020-03-02 11:41:54 +01:00
13466536bd
Show correct counter of deleted alerts - #5509
2020-03-02 11:23:20 +01:00
b125f7618e
browser option in wux modules
2020-02-27 18:41:28 +01:00
82fe47cfd9
Ent 5312 snmp browser enchancements
2020-02-27 16:31:09 +01:00
ec57540fb0
Ent 5432 libreria de modulos de pandora integrada en consola
2020-02-27 11:20:24 +01:00
43ca1bdc5d
Merge branch 'ent-5336-SNMP-Interface-Wizard' into 'develop'
...
Fixed when you select 'show all modules' and the module is not from the interface
See merge request artica/pandorafms!3056
2020-02-24 14:30:49 +01:00
4bdea42c63
fix bad parameter in function call
2020-02-24 13:16:22 +01:00
6ccc606c74
Merge remote-tracking branch 'origin/develop' into ent-5408-consola-visual-nueva-bugs
2020-02-20 08:06:59 +01:00
ab568bdb52
Merge branch 'ent-5488-Mala-redireccion-en-wizard-de-wmi-que-inhabilita-la-funcionalidad' into 'develop'
...
fix bug in form action
See merge request artica/pandorafms!3065
2020-02-19 11:30:34 +01:00
e265bc2970
Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens
2020-02-19 09:31:31 +01:00
1acfaa9cdc
Merge branch 'ent-5429-Cambios-en-el-editor-de-modulos' into 'develop'
...
Ent 5429 cambios en el editor de modulos
See merge request artica/pandorafms!3052
2020-02-18 14:03:36 +01:00
65b3b1dc36
fix bug in form action
2020-02-18 13:47:47 +01:00
7564249207
Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens
2020-02-17 16:15:29 +01:00
10972a2364
Fix bug icon builder view not legacy mode
2020-02-13 08:45:25 +01:00
5d436d214b
Merge branch 'ent-4740-revision-completa-de-informes-templates-en-nodo' into 'develop'
...
Fixed bug in prediction report item 4740
See merge request artica/pandorafms!2872
2020-02-11 15:39:26 +01:00
e65de54f39
Fixed when you select 'show all modules' and the module is not from the interface
2020-02-10 15:46:04 +01:00
0538bd5185
Merge branch 'ent-5227-Problema-encoding-aplicación-politicas' into 'develop'
...
Ent 5227 problema encoding aplicación politicas
See merge request artica/pandorafms!3055
2020-02-10 12:14:19 +01:00
4f14921e85
Fixed bug in reports
2020-02-10 11:40:33 +01:00
b658fddfc2
visual changes in module creation
2020-02-07 13:58:26 +01:00
5b08e71ec6
Solved issue with UTF8 chars in configuration_data field
2020-02-06 13:02:58 +01:00
1cca736953
Merge branch 'ent-4788-Icono-GIS-en-Setup-desaparecido' into 'develop'
...
Ent 4788 icono gis en setup desaparecido
See merge request artica/pandorafms!2843
2020-02-05 12:35:50 +01:00
8b60daa9ba
Merge branch 'ent-5362-9464-Fallo-en-vista-de-agente-con-modulos-generic_string' into 'develop'
...
fix module string data with html special chars breaking html in page
See merge request artica/pandorafms!3042
2020-02-04 10:10:07 +01:00
32cb47fb71
Merge branch 'ent-5251-9432-No-se-pueden-crear-usuarios-con-password-policy-activado' into 'develop'
...
Fixed password policy
See merge request artica/pandorafms!3020
2020-02-03 16:06:43 +01:00
6aae378b37
Merge branch 'ent-4533-descuadre-visual-usuarios-metaconsola' into 'develop'
...
ajuste visual en tabla user management
See merge request artica/pandorafms!2682
2020-02-03 13:55:42 +01:00
73f3dfac85
fix module string data with html special chars breaking html in page
2020-01-31 11:53:42 +01:00
d5016d4943
Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens
2020-01-28 10:08:01 +01:00
0dabab11cf
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
...
Conflicts:
pandora_console/install.php
2020-01-27 16:19:32 +01:00
28392b71ef
Merge branch 'ent-5066-9061-Crear-Failover-en-Informe-de-disponibilidad' into 'develop'
...
availability failover
See merge request artica/pandorafms!3015
2020-01-27 10:48:50 +01:00
aea073b4d5
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
2020-01-24 11:41:35 +01:00
fe697a98ec
fixed errors VC
2020-01-23 19:54:47 +01:00
79a34ac756
Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens
2020-01-23 11:06:15 +01:00
2447514c41
Merge branch 'ent-4259-el-id-del-agente-con-remote-config-se-corta-en-la-vista-de-manage-resolucion-portatil' into 'develop'
...
Fix visual problems with agent details
See merge request artica/pandorafms!2625
2020-01-23 10:11:35 +01:00
6c6403336f
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
2020-01-23 08:14:24 +01:00
823fb30db7
Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens
2020-01-22 13:42:58 +01:00
69d9051339
Merge branch 'ent-5172-metaconcola-informes-ajustes-para-agrupados' into 'develop'
...
Fixed visual bug in grouped report item
See merge request artica/pandorafms!2992
2020-01-22 12:20:05 +01:00
32b28bea0c
Added warning in update manager offline
2020-01-22 11:10:02 +01:00
428e0ffbd7
Fixed password policy
2020-01-21 17:31:21 +01:00
76ed257287
Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens
2020-01-21 15:23:26 +01:00
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
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
536af6f33a
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
2020-01-19 11:37:18 +01:00
96eebe4310
Merge branch 'ent-5135-No-funciona-la-exploracion-SNMP-remota' into 'develop'
...
Added port option on server configuration to be used when connecting to execution server
See merge request artica/pandorafms!3012
2020-01-17 14:40:58 +01:00
8778553cca
Merge branch 'ent-5135-No-funciona-la-exploracion-SNMP-remota' of https://brutus.artica.es:8081/artica/pandorafms into ent-5135-No-funciona-la-exploracion-SNMP-remota
2020-01-16 17:42:45 +01:00
fb7cb57f03
added check to disable satellite servers from exec servers available in snmp wizard in case it is not a satellite agent or has remote config
2020-01-16 17:42:31 +01:00
d5e21499c2
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
2020-01-16 14:08:07 +01:00
0980c9a74a
Ent 5261 cambio de control de intervalo en alertas
2020-01-16 13:50:39 +01:00
5268c23c7a
Merge branch 'develop' into 'ent-4705-encriptado-de-nuevos-tokens'
...
# Conflicts:
# pandora_console/include/functions_config.php
2020-01-16 09:23:42 +01:00
4a1801bc50
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
2020-01-16 08:04:18 +01:00
c68f83f013
availability failover
2020-01-15 17:16:46 +01:00
c389769602
Merge branch 'develop' into 'ent-5135-No-funciona-la-exploracion-SNMP-remota'
...
# Conflicts:
# pandora_console/extras/mr/35.sql
2020-01-15 17:12:32 +01:00
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
3f26f2ef6f
fix bug when deleting custom units and changed default value for byte multiplier
2020-01-15 16:00:33 +01:00
8b6c1261a9
change order of form port input
2020-01-15 15:37:42 +01:00
5eb2953810
Added port option on server configuration to be used when connecting to execution server
2020-01-14 15:43:17 +01:00
95600412e1
Minor visual changes in alert list
2020-01-14 13:14:09 +01:00
dcd2aae3c5
Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024'
...
# Conflicts:
# pandora_console/extras/mr/35.sql
2020-01-14 10:28:55 +01:00
ed53399c3c
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
2020-01-14 09:34:31 +01:00
7204e7c0f2
Ent 4862 mas opciones en los filtros de severidad
2020-01-13 18:24:29 +01:00
db49db3711
report font not depending of custom report front enabled
2020-01-13 18:21:48 +01:00
49e03f5e44
Fixed XSS vulnerability
2020-01-13 11:29:18 +01:00
fe46a2a74e
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
2020-01-13 08:07:20 +01:00
78df8dcb95
prevent user creation with leading or trailing spaces in user id
2020-01-10 13:50:04 +01:00
ec6a763aa2
add check to prevent user creation with an id with trailing spaces
2020-01-10 13:24:00 +01:00
4670ed922a
Added control for correct UTF8 encoding
2020-01-09 17:25:24 +01:00
665e9e4c98
Show gis icon only if enabled gis
2020-01-08 15:57:18 +01:00
f61ba42dd7
Resolve conflicts
2020-01-08 15:48:07 +01:00
7701ff7ad1
Resolve conflicts
2020-01-08 15:44:59 +01:00
eb222cc82f
Merge remote-tracking branch 'origin/develop' into ent-4788-Icono-GIS-en-Setup-desaparecido
...
Conflicts:
pandora_console/godmode/setup/setup.php
2020-01-08 15:41:45 +01:00
c4f0305f9b
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
2020-01-08 08:29:59 +01:00
0468c85a4d
Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024'
...
# Conflicts:
# pandora_console/godmode/setup/setup_visuals.php
2020-01-07 12:00:27 +01:00
eea9b0337c
Merge branch 'ent-5081-Fallo-estético-en-el-Update-manager-Offline' into 'develop'
...
Ent 5081 fallo estético en el update manager offline
See merge request artica/pandorafms!2977
2020-01-07 11:12:59 +01:00
7c952eaaa8
changes visual setup
2020-01-07 10:56:37 +01:00
5f3889b5f6
Merge branch 'ent-4573-Cambio-en-el-switch-de-deshabilitar-agentes' into 'develop'
...
Change label for disabled status - #4573
See merge request artica/pandorafms!2693
2020-01-07 10:48:11 +01:00
22e0a4c818
Merge branch 'ent-4620-Campo-module-inservible-en-open' into 'develop'
...
Ent 4620 campo module inservible en open
See merge request artica/pandorafms!2721
2020-01-07 10:46:13 +01:00
997d1e46e5
Merge branch 'ent-4996-no-funciona-el-select-multiple-de-agente-en-el-wizard-de-consolas-visuales' into 'develop'
...
Added hint
See merge request artica/pandorafms!2904
2020-01-07 09:26:11 +01:00
4cd1ca38a4
Ent 5091 unificacion de tamaño de letra en informes
2020-01-07 09:25:31 +01:00
5e008e684d
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
2020-01-02 17:45:52 +01:00
ec950b199e
Merge branch 'ent-4488-Añadir-confirmacion-al-borrado-de-consolas-visuales' into 'develop'
...
Ent 4488 añadir confirmacion al borrado de consolas visuales
See merge request artica/pandorafms!2859
2019-12-26 13:42:28 +01:00
3f09d13941
Fixed visual bug in grouped report item
2019-12-24 10:25:32 +01:00
c91290f062
Merge branch 'ent-4955-Bug-nombre-y-descripcion-items-informes' into 'develop'
...
Changed title name or description in items table of reports
See merge request artica/pandorafms!2875
2019-12-23 17:13:39 +01:00
7b97855dd7
Merge branch 'ent-3607-fallos-visuales-en-la-vista-de-plugin-de-la-metaconsola' into 'develop'
...
Fixed file.png in plugin
See merge request artica/pandorafms!2725
2019-12-23 17:10:56 +01:00
7f61caaa15
Merge branch 'ent-5034-Bug-al-copiar-acción-de-alerta' into 'develop'
...
Ent 5034 bug al copiar acción de alerta
See merge request artica/pandorafms!2921
2019-12-23 10:51:10 +01:00
fa34170e34
Merge branch 'ent-5117-problemas-con-el-inventory-en-meta' into 'develop'
...
Fixed bug in inventory item
See merge request artica/pandorafms!2975
2019-12-23 10:23:21 +01:00
69159d158d
Merge branch 'ent-1786-Rango-de-tiempo-en-container-graphs' into 'develop'
...
Ent 1786 rango de tiempo en container graphs
See merge request artica/pandorafms!2931
2019-12-23 10:18:39 +01:00
c5af1823e3
Merge branch 'ent-2023-Poder-editar-la-opcion-Safe-operation-mode-mediante-Bulk-operations' into 'develop'
...
Ent 2023 poder editar la opcion safe operation mode mediante bulk operations
See merge request artica/pandorafms!2918
2019-12-23 10:18:14 +01:00
4aa57143e7
Fixed visual bug in update manager offline
2019-12-19 09:42:54 +01:00
b551f1a13c
update
2019-12-18 17:48:29 +01:00
9e88c1c2c2
Fixed bug in inventory item
2019-12-18 17:00:14 +01:00
91fe85e90e
updates2
2019-12-18 15:15:25 +01:00
49ab5e95aa
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
2019-12-18 07:50:08 +01:00
168dfcf32d
minnor error
2019-12-17 15:23:01 +01:00
eca876212c
Ent 5095 visualizacion formato de fechas
2019-12-17 12:15:51 +01:00
d77d50bb74
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
2019-12-17 08:26:04 +01:00
ad9879bc1e
Merge branch 'ent-5158-Informes-SQL-en-la-meta' into 'develop'
...
Fixed item sql
See merge request artica/pandorafms!2966
2019-12-16 18:23:17 +01:00
ded6dcb41a
Merge remote-tracking branch 'origin/develop' into ent-5108-ws-cookie-parser
2019-12-16 16:44:02 +01:00
8bde504fc2
Fixed item sql
2019-12-16 15:50:21 +01:00
abd2213e71
Menu entry for websocket engine settings
2019-12-16 15:42:54 +01:00
24838cad0f
Merge branch 'ent-4233-Modificación-en-la-función-genérica-de-render-de-fecha-hora' into 'develop'
...
Added compact mode to show timestamp - #4233
See merge request artica/pandorafms!2688
2019-12-16 11:48:09 +01:00
b71752ea03
Merge remote-tracking branch 'remotes/origin/ent-5108-ws-cookie-parser' into develop
2019-12-16 11:23:06 +01:00
b38c396837
Change date in hover in compact mode
2019-12-13 13:40:19 +01:00
a558152cb2
minor fix
2019-12-13 13:20:44 +01:00
ad6ea431bf
minor fix, hide quickshell settings while disabled
2019-12-13 13:13:09 +01:00
bd1954ce38
Setup Websocket engine, unified
2019-12-13 13:11:38 +01:00
9e01cb097c
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
2019-12-13 13:02:04 +01:00
13ac0a6229
Merge branch 'ent-5082-setup-visual-styles-reports' into 'develop'
...
Grouped report items on styles conf. Fixed font bug
See merge request artica/pandorafms!2953
2019-12-13 11:51:56 +01:00
3b5ebd0bf7
Better quickshell integration and fixes
2019-12-13 11:46:44 +01:00
319b3e604f
Merge remote-tracking branch 'origin' into new-vc-line-element
2019-12-13 08:15:23 +01:00
a2162948b4
Fixed minor bugs in metaconsole reports
2019-12-12 18:12:42 +01:00
0a7f24192e
Merge branch 'ent-5110-formulario-de-modulos-remotos-erroneo' into 'develop'
...
Fixed bug in module creation view
See merge request artica/pandorafms!2954
2019-12-12 17:07:35 +01:00
3223e0a8e1
Merge branch 'ent-4865-8983-modulos-snmp-v3-politicas' into 'develop'
...
Fixed snmp input
See merge request artica/pandorafms!2914
2019-12-12 17:01:12 +01:00
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
2504a3dc09
Fixed bug in module creation view
2019-12-12 13:50:35 +01:00
ab1c6e17ca
Merge branch 'ent-4508-desajustes-y-bug-en-open' into 'develop'
...
fixed minnor error
See merge request artica/pandorafms!2929
2019-12-12 11:03:22 +01:00
7ea61b7424
Added controls on report items
2019-12-12 09:11:15 +01:00
a364af3b2d
Grouped report items on styles conf. Fixed font bug
2019-12-11 18:32:49 +01:00
0d16bc3188
Merge branch '4605-Bug-Wizard-SNMP' into 'develop'
...
Modified type of module when use SNMP Agent Wizard
See merge request artica/pandorafms!2947
2019-12-11 16:24:29 +01:00
3dbdfdb6eb
Fix Landscape reports
2019-12-11 15:07:38 +01:00
62de2fe396
Modified type of module when use SNMP Agent Wizard
2019-12-10 15:37:04 +01:00
bc1109e0ae
Merge branch 'ent-5049-crear-accion-de-alerta-solo-deja-elegir-el-grupo-all' into 'develop'
...
Fixed bugs in alert actions
See merge request artica/pandorafms!2942
2019-12-10 15:32:51 +01:00
1e0818786b
Merge branch 'ent-4652-ajustar-posicion-del-label-el-item-imagen-estatica-de-consolas-visuales' into 'develop'
...
Adjusted margin on static image item
See merge request artica/pandorafms!2895
2019-12-10 11:56:06 +01:00
6ba4a26564
Added timeoout option to command event responses
2019-12-10 11:54:30 +01:00
7a616018a1
Merge branch 'ent-4619-fallos-css-advanced-options-agentes-open' into 'develop'
...
fixed visual error
See merge request artica/pandorafms!2758
2019-12-10 11:48:45 +01:00
5880bec88a
changes in module data formatting when printed across the application and new setup options
2019-12-05 17:41:44 +01:00
85f4301e4c
Fixed bugs in alert actions
2019-12-05 16:43:26 +01:00
810fe8f860
Revert "Merge branch 'ent-4968-Comandos-de-alerta-con-saltos-de-linea' into 'develop'"
...
This reverts merge request !2886
2019-12-03 15:59:08 +01:00
809628560b
Merge branch 'ent-4968-Comandos-de-alerta-con-saltos-de-linea' into 'develop'
...
Ent 4968 comandos de alerta con saltos de linea
See merge request artica/pandorafms!2886
2019-12-03 15:53:23 +01:00
fecd2c74b5
Added button to refresh graph in container graphs
2019-12-03 13:00:59 +01:00
d7288114ad
fixed minnor error
2019-12-02 18:17:54 +01:00
0420a439d1
Send params to copy and delete action alert by post
2019-11-28 11:51:32 +01:00
ed0ad76e61
Merge branch 'ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este' into 'develop'
...
Add new search for id source event in metaconsole
See merge request artica/pandorafms!2438
2019-11-27 10:14:35 +01:00
d8e1786830
Added Save Operation Mode option in agents bulk operations
2019-11-26 16:44:53 +01:00
d89ec20c52
Fixed snmp input
2019-11-25 17:24:28 +01:00
5423e78d62
Merge remote-tracking branch 'origin/develop' into ent-4610-Alertas-de-logs
...
Conflicts:
pandora_console/extras/mr/33.sql
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/godmode/agentes/configurar_agente.php
pandora_console/godmode/wizards/Wizard.main.php
pandora_console/include/functions_agents.php
pandora_console/include/styles/alert.css
pandora_console/pandoradb.sql
pandora_server/lib/PandoraFMS/Recon/Base.pm
2019-11-22 15:49:07 +01:00
21bf49c218
update id_source_event
2019-11-22 13:38:08 +01:00
960326b980
Add menu omnishell
2019-11-21 18:21:46 +01:00
e4ba7ccde0
Added hint
2019-11-21 12:06:00 +01:00
624a1e0086
WIP alert correlation
2019-11-20 18:17:43 +01:00
1b5dcc3e28
Fixed errors in remote command
2019-11-19 12:35:52 +01:00
fe1e7da0ed
Adjusted margin on static image item
2019-11-18 17:36:16 +01:00
61eb7f0635
Merge remote-tracking branch 'origin/ent-4226-mejoras-plugin-sap' into ent-EDF
2019-11-18 09:55:15 +01:00
91f28384b8
changed sap icon button
2019-11-15 16:22:30 +01:00
8edbb74354
discovery help link and minor fixes
2019-11-14 21:52:02 +01:00
f69b86663a
Merge remote-tracking branch 'origin/ent-4226-mejoras-plugin-sap' into ent-EDF
...
Conflicts:
pandora_console/extras/mr/33.sql
pandora_console/godmode/wizards/Wizard.main.php
2019-11-14 21:40:35 +01:00
f348310675
ADD function to get SAP agents and sap view to sap agents
2019-11-14 19:01:23 +01:00
0d3817d64d
dynamic toggle in wizard input printForm
2019-11-14 17:45:45 +01:00
9a17a02d61
Fixed bug with line breaks in alert commands
2019-11-14 12:29:02 +01:00
0199c6312a
Merge branch 'ent-4752-Herramientas-de-diagnostico' into 'develop'
...
refactoriced diagnostics pandoraFMS
See merge request artica/pandorafms!2809
2019-11-14 11:49:23 +01:00
a8b6f40ca1
change sap view menu position
2019-11-14 10:51:00 +01:00
83590146b1
Merge remote-tracking branch 'origin/develop' into ent-4774-welcome-to-pandorafms
2019-11-13 17:38:24 +01:00
9b1a3a9cd1
Firts_task => first_task
2019-11-13 14:58:53 +01:00
f844c660af
Merge branch 'ent-4766-feedback-de-ayudas' into 'develop'
...
add feedback
See merge request artica/pandorafms!2813
2019-11-13 13:43:08 +01:00
875d4430a7
Merge remote-tracking branch 'origin/ent-EDF' into ent-4772-omnishell
2019-11-13 12:21:42 +01:00
b11dbc639f
Merge remote-tracking branch 'origin/ent-4752-Herramientas-de-diagnostico' into ent-EDF
...
Conflicts:
pandora_console/general/header.php
2019-11-13 12:20:29 +01:00
7103317bc2
Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico
...
Conflicts:
pandora_console/general/header.php
pandora_console/include/styles/pandora.css
2019-11-13 12:12:17 +01:00
fe45afa662
Merge remote-tracking branch 'origin/develop' into ent-4226-mejoras-plugin-sap
2019-11-13 12:01:36 +01:00
d4c4b3c2d8
Merge branch 'ent-4664-Bug-Automatically-combined-graph' into 'develop'
...
Ent 4664 bug automatically combined graph
See merge request artica/pandorafms!2776
2019-11-13 10:01:19 +01:00
d1fbd36a97
WIP omnishell
2019-11-12 19:31:38 +01:00
073ca73b2a
Merge branch 'ent-4670-Cambiar-tamaño-fuente-en-informes' into 'develop'
...
Added token in visual styles to change the font size in items of reports - #4670
See merge request artica/pandorafms!2798
2019-11-12 18:09:39 +01:00
b9633933e1
Merge remote-tracking branch 'origin/develop' into ent-4774-welcome-to-pandorafms
...
Conflicts:
pandora_console/extras/mr/33.sql
pandora_console/general/header.php
2019-11-12 14:17:45 +01:00
7b06ceaafc
add sap menu
2019-11-12 10:54:36 +01:00
19d06dc061
Merge remote-tracking branch 'origin/ent-EDF' into ent-4226-mejoras-plugin-sap
2019-11-12 10:19:34 +01:00
5ea93011d3
Changed title name or description in items table of reports
2019-11-12 09:53:10 +01:00
53954ec853
Merge branch 'ent-4774-welcome-to-pandorafms' into ent-EDF
2019-11-11 14:26:23 +01:00
65f5223698
validation alerts
2019-11-11 14:26:04 +01:00
0b610cd8ba
Merge branch 'ent-4774-welcome-to-pandorafms' into ent-EDF
2019-11-11 13:39:08 +01:00
430af38fa6
minor fixes in flow control
2019-11-11 13:38:27 +01:00
ea83ee1292
Fixed bug in prediction report item 4740
2019-11-08 12:06:06 +01:00
d9d8cbfd35
Merge remote-tracking branch 'origin/ent-EDF' into ent-4772-omnishell
2019-11-07 19:43:18 +01:00
adc0f24f8e
Merge branch 'ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace' into 'develop'
...
Ent 3178 integrar terminal web en la consola de pandora y explorar otras utilidades anyterm replace
See merge request artica/pandorafms!2825
2019-11-07 15:48:12 +01:00
79d165b164
Merge remote-tracking branch 'origin/develop' into ent-EDF
2019-11-06 20:01:28 +01:00
90d567a064
Merge branch 'develop' into 'ent-4664-Bug-Automatically-combined-graph'
...
Conflicts:
pandora_console/godmode/reporting/graphs.php
2019-11-06 17:48:51 +01:00
e81932cf0d
Merge branch 'ent-4809-Seleccion-de-tamaño-de-fuente-en-Agent-detail' into 'develop'
...
Fixed visual styles ticket 4809
See merge request artica/pandorafms!2867
2019-11-06 16:23:51 +01:00
0647b156a5
Merge branch 'ent-4904-8870-No-se-puede-ver-usuarios-sin-permisos-AR' into 'develop'
...
fix bug in user list permission checks
See merge request artica/pandorafms!2865
2019-11-06 16:06:49 +01:00
98237a8d34
Merge remote-tracking branch 'origin/develop' into ent-EDF
...
Conflicts:
pandora_console/general/header.php
2019-11-06 15:36:53 +01:00
a486738920
Fixed visual styles ticket 4809
2019-11-06 10:31:26 +01:00
4b9d6f1ae2
fix bug in user list permission checks
2019-11-05 17:18:38 +01:00
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
276fc82556
Merge branch 'ent-EDF' into ent-4226-mejoras-plugin-sap
...
Conflicts:
pandora_console/extras/mr/33.sql
2019-11-05 15:39:18 +01:00
e5f24ca884
Merge develop
2019-11-05 15:27:06 +01:00
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
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
c83b85c225
Ent 4801 error informes pdf csv
2019-11-04 18:41:03 +01:00
7c73d5f51a
Added confirmation to delete a visual console
2019-11-04 17:56:28 +01:00
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
d0c2c0d1eb
Fixed visual bug in general report item
2019-11-04 10:39:16 +01:00
aa30a12f31
wizard doc minor fix
2019-10-31 21:15:18 +01:00
115c884cd4
Discovery SAP
2019-10-31 21:13:18 +01:00
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
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
c07baa614f
Merge remote-tracking branch 'origin/ent-4766-feedback-de-ayudas' into ent-EDF
2019-10-29 17:00:57 +01:00
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
383967f68a
Merge branch 'ent-4769-modulos-ssh-php-perl' into ent-EDF
2019-10-29 16:56:01 +01:00
0a53c0b915
Merge remote-tracking branch 'origin/ent-4752-Herramientas-de-diagnostico' into ent-EDF
2019-10-29 16:50:46 +01:00
898945d47f
Added icon for gis maps connections in tabs of setup
2019-10-29 13:26:36 +01:00
57bfc364ae
add modal confirmation window
2019-10-28 18:57:10 +01:00
6d21f71617
removed trace
2019-10-28 18:38:56 +01:00
7d5b845e1f
minor fixes
2019-10-28 18:37:01 +01:00
e12bcb2ac4
Merge remote-tracking branch 'origin/develop' into ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace
2019-10-28 12:59:02 +01:00
ccf971c2eb
Merge remote-tracking branch 'origin/develop' into ent-4769-modulos-ssh-php-perl
2019-10-28 12:18:19 +01:00
b54ece2b70
Add menu omnishell
2019-10-28 10:46:25 +01:00
709f4cac81
WebSocket configuration, quickShell settings, quickShell proxied url compatibility
2019-10-23 19:56:48 +02:00
de22fb70e3
Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico
2019-10-23 19:51:49 +02:00
5b3fd5dd79
Merge remote-tracking branch 'origin/develop' into ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace
2019-10-22 17:34:41 +02:00
eb98f695f9
Merge branch 'ent-4745-8826-cofares-han-dejado-de-llegar-las-graficas-que-nos-llegaban-en-los-correos-de-alerta-por-mail' into ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace
2019-10-22 17:34:34 +02:00
b35c9dd96d
ajust changes
2019-10-22 16:42:13 +02:00
33d26144f1
Fixed planned downtime acl
2019-10-22 16:00:01 +02:00
bbeb750e46
Merge branch 'develop' into ent-4690-revision-completa-de-informes-templates-en-meta
...
Conflicts:
pandora_console/include/functions_graph.php
2019-10-22 15:51:38 +02:00
deb217906c
Fixed bug in templates
2019-10-22 15:41:13 +02:00
6963ce894b
Merge branch 'develop' into 'ent-4836-menu-duplicado-en-reports-de-metaconsola'
...
# Conflicts:
# pandora_console/godmode/reporting/reporting_builder.php
2019-10-22 13:26:15 +02:00
70978f838c
fixed visual error metaconsole
2019-10-22 13:22:13 +02:00
0cf3e01f74
Merge branch 'ent-1880-Umbrales-inversos-en-negativo' into 'develop'
...
Ent 1880 umbrales inversos en negativo
See merge request artica/pandorafms!2818
2019-10-22 12:56:21 +02:00
ca49cefb0d
fixed
2019-10-22 12:19:25 +02:00
ee97ed8a5e
segunda ronda
2019-10-21 18:36:02 +02:00
6c52462c8c
Modular WebSocket engine, added ssh and telnet to quickshell extension
2019-10-21 17:36:26 +02:00
547607c21e
Merge branch 'ent-4794-Permiso-Manage-Users-no-funciona' into 'develop'
...
Ent 4794 permiso manage users no funciona
See merge request artica/pandorafms!2804
2019-10-21 10:48:36 +02:00
353246f9f6
first changed to welcome window
2019-10-18 10:30:19 +02:00
e5890b038d
Merge branch 'ent-4069-Graphs-containers-in-Custom-graphs-error' into 'develop'
...
Ent 4069 graphs containers in custom graphs error
See merge request artica/pandorafms!2787
2019-10-17 14:20:06 +02:00
adf3b08537
Add text (inv) in the help of the thresholds for inverse intervals - #1880
2019-10-17 11:50:50 +02:00
e80ef83d66
Merge branch 'ent-4692-vodat-al-editar-un-item-de-un-custom-report-devuelve-la-pantalla-de-item-editor' into 'develop'
...
When an item is updated, it is redirected to the item lists
See merge request artica/pandorafms!2755
2019-10-17 10:13:40 +02:00
039d854441
Merge branch 'ent-4784-Selector-de-intervalo-en-bulks-pule-el-conf-de-los-agentes-con-remote-dependiendo-de-la-opción-que-seleccionemos' into 'develop'
...
Ent 4784 selector de intervalo en bulks pule el conf de los agentes con remote dependiendo de la opción que seleccionemos
See merge request artica/pandorafms!2800
2019-10-16 14:16:13 +02:00
8999f408ef
redirect to list items when update item
2019-10-15 14:13:07 +02:00
a31e66a9bd
add feedback
2019-10-15 12:16:50 +02:00
8407d7fe9a
Merge branch 'ent-3913-gis-data-refresh-bug' into 'develop'
...
Added current gis location to agent gis view list
See merge request artica/pandorafms!2772
2019-10-14 15:57:27 +02:00
a1c4b3eaeb
Fixed minor bug
2019-10-14 13:38:10 +02:00
66bad65550
refactoriced diagnostics pandoraFMS
2019-10-11 14:55:20 +02:00
5ffa93bb25
Modified character for string fusion
2019-10-11 13:49:19 +02:00
4c6d924495
Review remote execution modules
2019-10-11 12:50:29 +02:00
8c556d7d19
Changed permissions for management users - #4794
2019-10-11 11:47:38 +02:00
4fedfe92fc
fix is enterprise
2019-10-11 09:39:20 +02:00
fc0e4827ea
No change interval if is empty in massive edit - #4784
2019-10-10 13:37:01 +02:00
7eb4d3c51c
add CMD command a network components
2019-10-10 11:55:32 +02:00
40076b0a55
remove debug
2019-10-09 17:33:06 +02:00
8af72c1c9d
add Remote CMD
2019-10-09 17:26:06 +02:00
18679f90e5
Added token in visual styles to change the font size in items of reports - #4670
2019-10-09 16:24:37 +02:00
d09c071684
discovery ACL
2019-10-09 15:45:02 +02:00
93bca4673f
Fixed bugs in reports
2019-10-09 13:15:07 +02:00
2eca6c7df3
Merge branch 'ent-4717-nombre-de-extensiones-erroneo-en-menu-php' into 'develop'
...
Deleted unnecessary "if" statement
See merge request artica/pandorafms!2759
2019-10-08 15:32:55 +02:00
0b14cb64b6
Merge branch 'ent-4293-bug-keepcounter-policies' into 'develop'
...
Fixed module update bug
See merge request artica/pandorafms!2769
2019-10-08 14:30:49 +02:00
941362776e
Fixed keepcounters ckbox bug
2019-10-08 14:06:30 +02:00
13b3099553
Merge branch 'ent-4775-Error-masivas-de-agente-sin-cambios' into 'develop'
...
added condition in agent massive edition
See merge request artica/pandorafms!2791
2019-10-08 13:11:55 +02:00
646f2607ab
added condition in agent massive edition
2019-10-07 19:02:19 +02:00
375fac7f3d
Merge branch 'ent-4681-8764-Fallo-en-Vodat-a-la-hora-de-editar-módulos-de-politica' into 'develop'
...
Fixed modules_get_relations
See merge request artica/pandorafms!2751
2019-10-07 14:01:24 +02:00
3b85842fb2
Hidden Graph Container section from open version - #4069
2019-10-07 12:44:00 +02:00
658d71568a
Merge branch 'ent-1945-eliminar-informes-tipo-itil' into 'develop'
...
the itil type is removed in the report types
See merge request artica/pandorafms!2757
2019-10-04 13:55:54 +02:00
6802b32d93
Merge branch 'ent-4578-No-se-registran-los-nombres-de-los-items-text-en-reports' into 'develop'
...
Fixed visual bug in item names from report template
See merge request artica/pandorafms!2707
2019-10-03 17:35:03 +02:00
ec86380ee7
changed hint from home screen edit user
2019-10-03 14:27:10 +02:00
a40592b041
Merge branch 'ent-4626-Checks-de-Custom-Graphs-desplazados' into 'develop'
...
Fixed bug in list graphs view
See merge request artica/pandorafms!2711
2019-10-03 10:37:49 +02:00
380ce879ef
Added io_safe_output to custom graphs name - #4664
2019-10-02 10:59:40 +02:00
fbsanchez
Tatiana Llorente
Luis
Daniel Rodriguez
alejandro-campos
Daniel Barbero Martin
marcos
Alejandro Fraguas
Daniel Maya
Manuel Montes
Jose Gonzalez
vgilc
artica