fbsanchez
|
bc166dfba2
|
module custom id in event list + minor fixes
|
2020-09-17 16:51:23 +02:00 |
Daniel Rodriguez
|
aceedbe795
|
Merge branch 'ent-6250-Errores-log-consola' into 'develop'
Ent 6250 errores log consola
Closes pandora_enterprise#6250
See merge request artica/pandorafms!3436
|
2020-09-15 15:30:07 +02:00 |
Daniel Rodriguez
|
56c79c8024
|
Merge branch 'ent-6234-10501-borrado-de-filtros-en-eventos' into 'develop'
fixed error with refresh in events filter
See merge request artica/pandorafms!3431
|
2020-09-15 15:29:04 +02:00 |
fbsanchez
|
c2238ac295
|
minor changes
|
2020-09-11 15:30:18 +02:00 |
fbsanchez
|
09a5bad4f1
|
Fixes in visualization (groups selection)
|
2020-09-11 15:17:08 +02:00 |
fbsanchez
|
3374a89ae0
|
Group selection improvement
|
2020-09-11 14:34:41 +02:00 |
Luis Calvo
|
4a93f6c3a6
|
Fixed metaconsole SNMP interface graphs
|
2020-09-08 11:48:27 +02:00 |
Jose Gonzalez
|
18a993145e
|
Fixed type array warning messages
|
2020-09-07 14:38:43 +02:00 |
marcos
|
6f02ee8206
|
fixed error with refresh in events filter
|
2020-09-04 12:38:46 +02:00 |
Daniel Rodriguez
|
37c8cb74ce
|
Merge branch 'ent-6123-Estado-de-los-log-source-de-agente' into 'develop'
Implemented log source status info box in agent view
See merge request artica/pandorafms!3379
|
2020-08-19 10:36:00 +02:00 |
alejandro-campos
|
29026ef3be
|
changed tooltip
|
2020-08-19 09:10:17 +02:00 |
Daniel Rodriguez
|
42c6989d5e
|
Merge branch 'ent-5685-Historico-de-eventos-en-Metaconsola-no-tiene-paginacion-correcta' into 'develop'
fix event pagination when events history is activated
See merge request artica/pandorafms!3401
|
2020-08-14 11:47:19 +02:00 |
alejandro-campos
|
6b989109d8
|
fix event pagination when events history is activated
|
2020-08-13 10:34:31 +02:00 |
marcos
|
41249220df
|
fixed vilnerability with filename incidents
|
2020-08-11 09:11:37 +02:00 |
marcos
|
e3a126c260
|
Merge remote-tracking branch 'origin/develop' into ent-6080-cambiar-text-advertencia-modulos-no-inicializados-en-vista-agente
|
2020-08-07 08:45:21 +02:00 |
Marcos Alconada
|
50c089587d
|
Update estado_monitores.php
|
2020-08-07 08:39:58 +02:00 |
daniel
|
fdad32e4f0
|
Add public link dashboards
|
2020-07-22 10:56:16 +02:00 |
Daniel Rodriguez
|
dd08f3bfdd
|
Merge branch 'ent-5964-AADCM-Refresh-time-en-CV-link-publico' into 'develop'
fix default refresh time in visual console public link
See merge request artica/pandorafms!3309
|
2020-07-21 10:48:57 +02:00 |
Daniel Rodriguez
|
4bf2a2fedd
|
Merge branch 'ent-5909-el-formato-encajado-de-la-busqueda-no-tiene-sentido' into 'develop'
fixed error
See merge request artica/pandorafms!3266
|
2020-07-16 12:10:31 +02:00 |
alejandro-campos
|
4edef7099b
|
added check to display log sources info box when log collector activated
|
2020-07-15 09:25:39 +02:00 |
Daniel Rodriguez
|
846fd10ce1
|
Merge branch 'ent-5824-connection-lost-warn' into 'develop'
Ent 5824 connection lost warn
See merge request artica/pandorafms!3326
|
2020-07-14 18:10:11 +02:00 |
alejandro-campos
|
909d7cba58
|
Implemented log source status info box in agent view
|
2020-07-14 17:12:38 +02:00 |
Daniel Rodriguez
|
8b8fd7bf30
|
Merge branch 'ent-5764-consola-visual-pantalla-completa-autohide' into 'develop'
Restored autoHide for controls modal in visual console with full screen
Closes pandora_enterprise#5764
See merge request artica/pandorafms!3299
|
2020-07-14 11:03:33 +02:00 |
Alejandro Fraguas
|
bd6904b99f
|
Merge branch 'ent-6002-pandora-communty-vulnerabilities' into 'develop'
Fixed xss event comments vulnerabiluty and some acls on event ajax
See merge request artica/pandorafms!3335
|
2020-07-13 10:06:26 +02:00 |
marcos
|
e2ae568ed3
|
change message in non initialited modules
|
2020-07-07 15:48:31 +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
|
032faf8c0c
|
WIP Smart services
|
2020-06-26 15:48:58 +02:00 |
Luis Calvo
|
9a8c42f4ac
|
Fixed xss event comments vulnerabiluty and some acls on event ajax
|
2020-06-26 15:36:51 +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 artica/pandorafms!3249
|
2020-06-24 12:46:49 +02:00 |
Daniel Rodriguez
|
9245e598a9
|
Merge branch 'ent-5679-Barras-desplazamiento-en-Consola-Visual-DIBA' into 'develop'
Ent 5679 barras desplazamiento en consola visual diba
See merge request artica/pandorafms!3253
|
2020-06-23 14:43:40 +02:00 |
alejandro-campos
|
584b19cc85
|
fix load spinner on close
|
2020-06-23 14:23:14 +02:00 |
Luis
|
efb69c18bc
|
Ent 5809 message delete not working
|
2020-06-22 13:52:54 +02:00 |
Luis Calvo
|
d346c76322
|
Connection error dialog working
|
2020-06-19 23:03:37 +02:00 |
alejandro-campos
|
ca281bac18
|
fix default refresh time in visual console public link
|
2020-06-16 12:44:10 +02:00 |
Daniel Rodriguez
|
38e4281395
|
Merge branch 'ent-5727-Eventos-campos-Agent-ID-y-Agent-name' into 'develop'
fixed agent id strange behavior in events table
See merge request artica/pandorafms!3231
|
2020-06-15 08:29:37 +02:00 |
Jose Gonzalez
|
daa0df8895
|
Restored autoHide for controls modal in visual console with full screen
|
2020-06-11 12:23:30 +02:00 |
marcos
|
165e3663a6
|
fixed error
|
2020-06-03 16:23:01 +02:00 |
fbsanchez
|
2de8f2b730
|
minor fix
|
2020-05-29 13:40:43 +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 |
Manuel Montes
|
611291c217
|
Ent 5428 revision total de ayudas hint wiki
|
2020-05-29 11:37:06 +02:00 |
alejandro-campos
|
f9b2d8ed40
|
removed overflow property
|
2020-05-28 16:48:46 +02:00 |
alejandro-campos
|
09672921ce
|
removed overflow property
|
2020-05-28 16:47:27 +02:00 |
alejandro-campos
|
6157030cff
|
added error to dialog submission when no agents or policies have been selected
|
2020-05-27 18:52:50 +02:00 |
alejandro-campos
|
6ba1a27274
|
added error to dialog submission when no agents or policies have been selected
|
2020-05-27 18:51:25 +02:00 |
alejandro-campos
|
1d167d4aba
|
fixed agent id strange behavior in events table
|
2020-05-25 11:12:29 +02:00 |
fbsanchez
|
e66f33fd37
|
WIP Cluster references updated
|
2020-05-22 12:14:01 +02:00 |
Daniel Rodriguez
|
46f1f44883
|
Merge branch 'ent-5574-field-description-not-in-general-search-nor-agent-detailed' into 'develop'
Added agent description to search and agent detail
See merge request artica/pandorafms!3130
|
2020-05-12 12:53:32 +02:00 |
Tatiana Llorente
|
1f16abd4bd
|
Ent 5701 quitar feature de chat
|
2020-05-08 15:39:24 +02:00 |
fbsanchez
|
92ff713651
|
1st approach
|
2020-05-05 18:58:45 +02:00 |
marcos
|
2d48c67377
|
add modal on Webchat
|
2020-04-28 13:56:43 +02:00 |
marcos
|
bcc68c0034
|
add modal on Webchat
|
2020-04-28 13:42:27 +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 |
Alejandro Fraguas
|
254a32be22
|
Merge branch 'ent-5691-Vulnerabilidad-XSS-en-sistema-de-mensajes' into 'develop'
fix cross-site scripting vulnerability
See merge request artica/pandorafms!3156
|
2020-04-14 15:36:48 +02:00 |
alejandro-campos
|
268e317ca3
|
fix cross-site scripting vulnerability
|
2020-04-14 12:50:19 +02:00 |
fbsanchez
|
58eeffd04d
|
clearer maps
|
2020-04-13 18:28:56 +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
|
333f3ba9f0
|
show full graph
|
2020-04-06 18:18:39 +02:00 |
marcos
|
6a9b55ea36
|
fixed minnor error
|
2020-04-06 14:48:26 +02:00 |
fbsanchez
|
2d4b977d26
|
Merge remote-tracking branch 'origin/develop' into ent-5575-wizard-de-modulos-y-recon-by-steps
|
2020-04-06 11:05:18 +02:00 |
alejandro-campos
|
60c766ca29
|
minor visual changes on user notifications editor
|
2020-04-02 10:37:59 +02:00 |
Luis Calvo
|
e575f65b6a
|
Added agent description to search and agent detail
|
2020-03-31 20:02:28 +02:00 |
fbsanchez
|
e48ef76f35
|
merge
|
2020-03-26 14:38:23 +01:00 |
daniel
|
709201bf23
|
dashboards
|
2020-03-26 12:29:38 +01:00 |
alejandro-campos
|
531e729ebe
|
added N/A in case last status change is not set
|
2020-03-25 18:01:39 +01:00 |
Alejandro Campos
|
b56076044b
|
Merge branch 'develop' into 'ent-5530-Mostrar-el-tiempo-en-que-un-elemento-se-ha-mantenido-en-un-estado'
# Conflicts:
# pandora_console/extras/mr/37.sql
|
2020-03-24 13:55:57 +01:00 |
Tatiana Llorente
|
4777ecd4bf
|
Ent 5439 error grafica eventos de agente
|
2020-03-24 10:12:14 +01:00 |
alejandro-campos
|
9d14c25b40
|
added order functionality to last status change column
|
2020-03-23 13:19:08 +01:00 |
alejandro-campos
|
e05c292d7d
|
show last status change of module
|
2020-03-23 12:47:58 +01:00 |
fbsanchez
|
ce11d89953
|
Frontent changes
|
2020-03-13 14:03:50 +01:00 |
alejandro-campos
|
db3709164a
|
Merge branch 'develop' into ent-5214-Bug-rutas
|
2020-03-12 13:15:19 +01:00 |
Tatiana Llorente
|
04f2ebeaf1
|
Ent 4515 filtro de alertas en vista de agente
|
2020-03-12 10:47:59 +01:00 |
Luis Calvo
|
1196524581
|
Fixed monitor view groups without tags
|
2020-02-28 12:33:36 +01:00 |
alejandro-campos
|
b29e0c7966
|
added ui_get_full_url to paths
|
2020-02-28 11:38:41 +01:00 |
Luis
|
82fe47cfd9
|
Ent 5312 snmp browser enchancements
|
2020-02-27 16:31:09 +01:00 |
Daniel Rodriguez
|
4e403bca72
|
Merge branch 'ent-5436-Vulnerabilidad' into 'develop'
fix bug when saving netflow filters
See merge request artica/pandorafms!3064
|
2020-02-21 13:27:34 +01:00 |
alejandro-campos
|
0a1dd6fe24
|
fix save of filters
|
2020-02-21 13:01:47 +01:00 |
Daniel Barbero Martin
|
c96dd8e930
|
Fix selector modules only string in VC barsgraph and donutgraph
|
2020-02-13 09:55:49 +01:00 |
Daniel Barbero Martin
|
10972a2364
|
Fix bug icon builder view not legacy mode
|
2020-02-13 08:45:25 +01:00 |
Daniel Barbero Martin
|
cad6889c46
|
Merge remote-tracking branch 'origin/develop' into ent-5408-consola-visual-nueva-bugs
|
2020-02-13 07:58:06 +01:00 |
Daniel Maya
|
e908019d4f
|
Ent 5318 no hay opcion de pantalla completa para las consolas visuales en la meta
|
2020-02-12 17:05:29 +01:00 |
Daniel Barbero Martin
|
0042f390ef
|
Fixed errors VC
|
2020-02-10 17:31:48 +01:00 |
Daniel Barbero Martin
|
902c42b559
|
Merge remote-tracking branch 'origin/develop' into ent-5408-consola-visual-nueva-bugs
|
2020-02-05 14:05:26 +01:00 |
Daniel Rodriguez
|
22649e016f
|
Merge branch 'ent-5362-9464-Fallo-en-vista-de-agente-con-modulos-generic_string' into 'develop'
fix html special characters breaking html in modules search
See merge request artica/pandorafms!3046
|
2020-02-04 16:56:26 +01:00 |
alejandro-campos
|
a51c17b512
|
fix html special characters breaking html in modules search
|
2020-02-04 16:39:54 +01:00 |
Daniel Rodriguez
|
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 |
fbsanchez
|
5da211aae0
|
ACL edit mode
|
2020-02-03 17:08:37 +01:00 |
alejandro-campos
|
d05551f85a
|
fix characters breaking html
|
2020-02-03 16:17:46 +01:00 |
Daniel Barbero Martin
|
dc6f1e3049
|
fixed errors VC
|
2020-01-29 10:56:29 +01:00 |
Daniel Barbero Martin
|
3f5e418d98
|
fixed errors VC
|
2020-01-28 16:42:51 +01:00 |
Daniel Barbero Martin
|
fe697a98ec
|
fixed errors VC
|
2020-01-23 19:54:47 +01:00 |
Daniel Barbero Martin
|
cd3691ecc3
|
fixed errors VC
|
2020-01-23 17:52:59 +01:00 |
Daniel Barbero Martin
|
3124e09c12
|
fixed errors VC
|
2020-01-23 09:20:40 +01:00 |
Daniel Barbero
|
203a91f065
|
fixed errors
|
2020-01-22 17:47:47 +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 Rodriguez
|
738361d237
|
Merge branch 'ent-4876-pandora_ui.js' into 'develop'
first changes pandora.js to pandora_ui.js
See merge request artica/pandorafms!2909
|
2020-01-20 09:54:20 +01:00 |
Daniel Barbero Martin
|
4a1801bc50
|
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
|
2020-01-16 08:04:18 +01:00 |
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 |
fbsanchez
|
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 |
Tatiana Llorente
|
c652f758f4
|
Changed label agent version for agents with satellite os
|
2019-11-12 13:06:59 +01:00 |
fbsanchez
|
307eabc7b9
|
Merge remote-tracking branch 'origin/develop' into ent-EDF
|
2019-11-07 18:33:37 +01:00 |
Tatiana Llorente
|
90912e2636
|
Hide agent info when only GIS data is displayed and it is empty
|
2019-11-07 09:52:06 +01:00 |