Luis
|
2926ead13b
|
Fixed group change on networkmap.ACL and source group working separated
|
2020-01-15 12:14:37 +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 Maya
|
7204e7c0f2
|
Ent 4862 mas opciones en los filtros de severidad
|
2020-01-13 18:24:29 +01:00 |
|
Daniel Rodriguez
|
df721fc550
|
Merge branch 'ent-4602-Descuadre-Visual-console-Chrome-y-Chromium' into 'develop'
Fixed public_console height
See merge request artica/pandorafms!2950
|
2020-01-13 18:24:01 +01:00 |
|
Tatiana Llorente
|
1747806256
|
Ent 3136 no se ven los eventos en el mapa de servicios cuando haces click en los elementos de un servicio creado en la meta
|
2020-01-13 18:19:50 +01:00 |
|
Daniel Barbero Martin
|
fe46a2a74e
|
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
|
2020-01-13 08:07:20 +01:00 |
|
Daniel Maya
|
c9a524b128
|
fixed interval counter
|
2020-01-10 11:12:05 +01:00 |
|
Daniel Barbero Martin
|
14e4e37c2a
|
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
|
2020-01-10 08:09:13 +01:00 |
|
Daniel Barbero
|
7e4cb02ceb
|
fixed styles and more
|
2020-01-09 18:05:21 +01:00 |
|
Daniel Rodriguez
|
1cef8aa62f
|
Merge branch 'ent-4658-cross-site-seguridad-base64' into 'develop'
Changed the mode of obtain the title
See merge request artica/pandorafms!2743
|
2020-01-09 16:46:58 +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 Rodriguez
|
fa9d60a3ef
|
Merge branch 'ent-5128-Metaconsola-conteo-y-paginacion' into 'develop'
fix pagination in meta monitor view
See merge request artica/pandorafms!2963
|
2020-01-07 09:46:22 +01:00 |
|
Daniel Rodriguez
|
e6616374f0
|
Merge branch 'ent-5000-Bug-en-el-icono-de-graficas-de-Monitor-detail-con-modulos-con-tags' into 'develop'
fix bug when checking acl permissions with regard to secondary groups in monitor view
See merge request artica/pandorafms!2908
|
2020-01-07 09:41:11 +01:00 |
|
Daniel Barbero Martin
|
5e008e684d
|
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
|
2020-01-02 17:45:52 +01:00 |
|
Alejandro Fraguas
|
45c57abb70
|
Merge branch 'ent-4883-Mensaje-erroneo-WebChat' into 'develop'
Ent 4883 mensaje erroneo web chat
See merge request artica/pandorafms!2856
|
2019-12-23 17:45:25 +01:00 |
|
Alejandro Fraguas
|
7061ab81b6
|
Merge branch 'ent-4911-Informacion-mostrada-en-mapa-GIS-the-Satellite-Server' into 'develop'
Ent 4911 informacion mostrada en mapa gis the satellite server
See merge request artica/pandorafms!2876
|
2019-12-23 10:24:10 +01:00 |
|
alejandro-campos
|
cc574cdb39
|
fix pagination in meta monitor view
|
2019-12-16 11:46:07 +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 |
|
Daniel Maya
|
b2b2cdbede
|
Fixed public_console height
|
2019-12-11 12:05:57 +01:00 |
|
Alejandro Fraguas
|
9a21710cd5
|
Merge branch 'ent-5054-Vista-de-Netflow-live-view-descojonada' into 'develop'
Ent 5054 vista de netflow live view descojonada
See merge request artica/pandorafms!2928
|
2019-12-11 11:37:02 +01:00 |
|
Tatiana Llorente
|
9d3426c0e9
|
Ent 4897 filtro erroneo de eventos al clickar en grafica events 24h de agente 2
|
2019-12-10 15:29:35 +01:00 |
|
vgilc
|
f4372bb766
|
Merge branch 'ent-4917-Pete-SQL-al-añadir-un-dia-especial-a-la-lista-de-dias-especiales' into 'develop'
Ent 4917 pete sql al añadir un dia especial a la lista de dias especiales
See merge request artica/pandorafms!2861
|
2019-12-10 11:43:46 +01:00 |
|
vgilc
|
776c683ac9
|
Merge branch 'ent-4922-Filtros-del-visor-de-traps-actualizan-solos' into 'develop'
Ent 4922 filtros del visor de traps actualizan solos
See merge request artica/pandorafms!2879
|
2019-12-10 11:43:07 +01:00 |
|
Tatiana Llorente
|
2d62955020
|
Changed filters styles in netflow live view
|
2019-12-02 16:11:17 +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 |
|
Alejandro Fraguas
|
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 |
|
Daniel Rodriguez
|
66c67ea74a
|
Merge branch 'ent-4226-mejoras-plugin-sap' into 'develop'
Ent 4226 mejoras plugin sap
See merge request artica/pandorafms!2853
|
2019-11-26 14:14:10 +01:00 |
|
marcos
|
0490024abc
|
add sap view to autorefresh edit my user
|
2019-11-25 15:01:27 +01:00 |
|
marcos
|
6f8bf104b4
|
update sap view
|
2019-11-25 13:50:26 +01:00 |
|
marcos
|
21bf49c218
|
update id_source_event
|
2019-11-22 13:38:08 +01:00 |
|
marcos
|
ab1a64a2e6
|
Merge remote-tracking branch 'origin/develop' into ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este
|
2019-11-22 10:56:36 +01:00 |
|
daniel
|
960326b980
|
Add menu omnishell
|
2019-11-21 18:21:46 +01:00 |
|
marcos
|
1640c03fc3
|
first changes pandora.js to pandora_ui.js
|
2019-11-21 16:42:39 +01:00 |
|
alejandro-campos
|
02780aed41
|
fix bug when checking acl permissions with regard to secondary groups in monitor view
|
2019-11-21 16:36:34 +01:00 |
|
Daniel Rodriguez
|
775289fc20
|
Merge branch 'ent-4550-ACL-acceso-denegado-detalles-agente-icono-grupo' into 'develop'
Changed definition of link in group icon
See merge request artica/pandorafms!2891
|
2019-11-21 10:21:07 +01:00 |
|
Marcos Alconada
|
34cdcdfd6e
|
Merge branch 'develop' into 'ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este'
# Conflicts:
# pandora_console/extras/mr/29.sql
# pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
# pandora_console/include/functions_events.php
|
2019-11-21 10:13:00 +01:00 |
|
marcos
|
294c160622
|
semifinal sap sap view agent
|
2019-11-20 18:01:07 +01:00 |
|
Jose Gonzalez
|
93200e2af1
|
Changed definition of link in group icon
|
2019-11-18 10:51:09 +01:00 |
|
fbsanchez
|
9440570548
|
Merge remote-tracking branch 'origin/ent-4772-omnishell' into ent-EDF
|
2019-11-15 13:08:09 +01:00 |
|
fbsanchez
|
e561b1f906
|
omnishell multiselect
|
2019-11-15 13:07:23 +01:00 |
|
fbsanchez
|
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 |
|
fbsanchez
|
14128590d6
|
Minor corrections&fixes
|
2019-11-14 17:05:01 +01:00 |
|
marcos
|
a8b6f40ca1
|
change sap view menu position
|
2019-11-14 10:51:00 +01:00 |
|
fbsanchez
|
83590146b1
|
Merge remote-tracking branch 'origin/develop' into ent-4774-welcome-to-pandorafms
|
2019-11-13 17:38:24 +01:00 |
|
fbsanchez
|
9b1a3a9cd1
|
Firts_task => first_task
|
2019-11-13 14:58:53 +01:00 |
|
fbsanchez
|
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 |
|
marcos
|
fe45afa662
|
Merge remote-tracking branch 'origin/develop' into ent-4226-mejoras-plugin-sap
|
2019-11-13 12:01:36 +01:00 |
|
Daniel Rodriguez
|
2f0b646cd8
|
Merge branch 'ent-4463-Histórico-IP' into 'develop'
Fixed scroll in other ip addres in agent view - #4463
See merge request artica/pandorafms!2641
|
2019-11-12 18:10:16 +01:00 |
|
Tatiana Llorente
|
50be60409e
|
Dont refresh the page when filter is changed in traps view
|
2019-11-12 15:58:36 +01:00 |
|