vgilc
|
418cf73c87
|
Merge branch 'ent-4506-item-de-consola-visual-tipo-line-imborrable-y-problemas-al-colocarlo' into 'develop'
Fixed bug in visual console line item
See merge request artica/pandorafms!2885
|
2019-12-10 11:49:42 +01:00 |
|
vgilc
|
e9de1df431
|
Merge branch 'ent-4713-Revisar-funcion-groups-get-id-recursive' into 'develop'
fix minor bug in function groups_get_id_recursive
See merge request artica/pandorafms!2842
|
2019-12-10 11:47:13 +01:00 |
|
vgilc
|
7db5f8b9b1
|
Merge branch 'ent-4887-service-tree-view-no-carga' into 'develop'
Solved issue with query
See merge request artica/pandorafms!2858
|
2019-12-10 11:46:17 +01:00 |
|
vgilc
|
f55a5c484e
|
Merge branch 'ent-4961-Ventana-filtro-de-eventos-muy-pequeña-si-el-nombre-de-filtro-es-muy-grande' into 'develop'
Ent 4961 ventana filtro de eventos muy pequeña si el nombre de filtro es muy grande
See merge request artica/pandorafms!2880
|
2019-12-10 11:35:41 +01:00 |
|
vgilc
|
f1e648404c
|
Merge branch 'ent-4999-9146-Ventanas-info-agentes-en-gis-no-funcionan-bien' into 'develop'
fix bug when selecting and unselecting feature in gis maps
See merge request artica/pandorafms!2905
|
2019-12-10 11:32:56 +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 artica/pandorafms!2907
|
2019-12-10 11:30:28 +01:00 |
Luis
|
2b03b00223
|
Fixed agent event graph bar and link to event list
|
2019-12-10 11:28:56 +01:00 |
artica
|
7a858fbc25
|
Auto-updated build strings.
|
2019-12-10 00:01:07 +01:00 |
|
artica
|
180d5842ee
|
Auto-updated build strings.
|
2019-12-09 00:01:08 +01:00 |
|
artica
|
8128f2605a
|
Auto-updated build strings.
|
2019-12-08 00:01:07 +01:00 |
|
artica
|
8f31fc21f1
|
Auto-updated build strings.
|
2019-12-07 00:01:07 +01:00 |
|
artica
|
f477014a1b
|
Auto-updated build strings.
|
2019-12-06 00:01:10 +01:00 |
|
Luis Calvo
|
a184b50eb2
|
Added margin to date selector elements in reporting viewer
|
2019-12-05 18:55:15 +01:00 |
Jose Gonzalez
|
3652f31a18
|
Code reset and solved other issues with comments
|
2019-12-05 17:06:58 +01:00 |
|
artica
|
0263060639
|
Auto-updated build strings.
|
2019-12-05 00:01:09 +01:00 |
marcos
|
be3dcccc4d
|
out entities
|
2019-12-04 17:45:58 +01:00 |
|
marcos
|
d6090771ef
|
Merge remote-tracking branch 'origin/develop' into ent-4481-entities-en-graficas-personalizadas-bullet-chart
|
2019-12-04 17:32:38 +01:00 |
|
artica
|
0ba2d86971
|
Auto-updated build strings.
|
2019-12-04 00:01:08 +01:00 |
|
Luis Calvo
|
22cd129f71
|
Fixed netflow command injection vulnerability
|
2019-12-03 13:58:14 +01:00 |
|
Jose Gonzalez
|
35ca0bc247
|
Possible solution to avoid issues with JS and apostrophe of other languages strings
|
2019-12-03 13:05:33 +01:00 |
|
artica
|
60aaf4363e
|
Auto-updated build strings.
|
2019-12-03 00:01:07 +01:00 |
|
artica
|
80d5eea467
|
Auto-updated build strings.
|
2019-12-02 00:01:08 +01:00 |
|
artica
|
882198798a
|
Auto-updated build strings.
|
2019-12-01 00:01:06 +01:00 |
|
artica
|
a6f881c6fa
|
Auto-updated build strings.
|
2019-11-30 00:01:08 +01:00 |
|
artica
|
14999b7b84
|
Auto-updated build strings.
|
2019-11-29 00:01:08 +01:00 |
|
artica
|
ec6d317bd4
|
Auto-updated build strings.
|
2019-11-28 00:01:09 +01:00 |
Daniel Barbero Martin
|
e6afe84940
|
Fixed pdf
|
2019-11-27 15:22:39 +01:00 |
|
Luis
|
b0d5b7223e
|
Added report template regex to MR
|
2019-11-27 13:21:05 +01:00 |
|
Daniel Barbero Martin
|
ea2c5bc8c9
|
Fixed translate
|
2019-11-27 11:49:20 +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 |
|
artica
|
d2fdc0cf9d
|
Auto-updated build strings.
|
2019-11-27 00:01:08 +01:00 |
manuel
|
12230c83c9
|
Added datetime in availability graph
|
2019-11-26 11:55:41 +01:00 |
fbsanchez
|
c985f2d5f9
|
Merge remote-tracking branch 'origin/ent-4610-Alertas-de-logs' into ent-EDF
Conflicts:
pandora_console/extras/mr/33.sql
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
|
2019-11-26 10:50:51 +01:00 |
|
artica
|
b3fa4b7b7d
|
Auto-updated build strings.
|
2019-11-26 00:01:08 +01:00 |
|
Daniel Barbero
|
867f0cfbe9
|
WIP Rules alert correlation
|
2019-11-25 20:06:42 +01:00 |
|
fbsanchez
|
1b57b279fb
|
minor changes
|
2019-11-25 13:03:55 +01:00 |
|
fbsanchez
|
a854809247
|
Merge remote-tracking branch 'origin/develop' into ent-4610-Alertas-de-logs
|
2019-11-25 09:39:25 +01:00 |
|
Daniel Barbero
|
f24034e729
|
Add styles Rules
|
2019-11-25 09:09:59 +01:00 |
|
artica
|
1592773b46
|
Auto-updated build strings.
|
2019-11-25 00:01:07 +01:00 |
|
artica
|
44311c0438
|
Auto-updated build strings.
|
2019-11-24 00:01:07 +01:00 |
|
fbsanchez
|
ae5d7b8944
|
minor style fix rulebuilder
|
2019-11-23 13:20:19 +01:00 |
|
fbsanchez
|
9bfe3f3152
|
minor style fix rulebuilder
|
2019-11-23 13:16:30 +01:00 |
|
fbsanchez
|
d3b5e7a2b0
|
minor style fix rulebuilder
|
2019-11-23 13:13:24 +01:00 |
|
fbsanchez
|
2f0b2c1766
|
minor fix css
|
2019-11-23 13:06:58 +01:00 |
|
fbsanchez
|
64e481187f
|
RuleBuilder Style updates
|
2019-11-23 12:48:47 +01:00 |
|
artica
|
09e6615611
|
Auto-updated build strings.
|
2019-11-23 00:01:09 +01:00 |
|
fbsanchez
|
4e2bd7ed55
|
minor fixes
|
2019-11-22 20:49:46 +01:00 |
|
fbsanchez
|
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 |
|
fbsanchez
|
8001ba0d41
|
minor fix
|
2019-11-22 15:37:32 +01:00 |
|
Daniel Barbero
|
d6ce54cddf
|
fixed errors Alert correlation
|
2019-11-22 15:26:30 +01:00 |
|
marcos
|
21bf49c218
|
update id_source_event
|
2019-11-22 13:38:08 +01:00 |
|
fbsanchez
|
5b5895a644
|
minor fix
|
2019-11-22 13:30:25 +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 |
|
marcos
|
de3f8b2a0f
|
updates
|
2019-11-22 10:56:30 +01:00 |
|
Daniel Barbero
|
4caf84da25
|
WIP alert correlations
|
2019-11-22 10:24:12 +01:00 |
artica
|
561e73d524
|
Updated version and build strings.
|
2019-11-22 10:03:53 +01:00 |
|
artica
|
b386da7da6
|
Auto-updated build strings.
|
2019-11-22 00:01:10 +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 |
|
Alejandro Fraguas
|
e9bd9f1b58
|
Merge branch 'ent-4444-Rendimiento-en-la-vista-de-eventos-en-metaconsola' into 'develop'
fixed secondary group in events
See merge request artica/pandorafms!2901
|
2019-11-21 16:09:01 +01:00 |
|
Daniel Barbero
|
66035a8b67
|
fixed errors css
|
2019-11-21 15:27:47 +01:00 |
alejandro-campos
|
8b9177c2e7
|
fix bug when selecting and unselecting feature in gis maps
|
2019-11-21 13:18:04 +01:00 |
|
fbsanchez
|
7af1841b8f
|
moved alert.js to correlated_alerts.js
|
2019-11-21 13:12:17 +01:00 |
|
fbsanchez
|
5195d6a754
|
Allow single quotes hidden_extended
|
2019-11-21 12:42:06 +01:00 |
|
fbsanchez
|
0f2b8a55a5
|
wip alert correlation
|
2019-11-21 12:05:14 +01:00 |
|
Luis
|
41e818334e
|
Ent 4954 urls documentacion soporte al fallar base datos
|
2019-11-21 11:14:50 +01:00 |
Daniel Maya
|
791454ee87
|
Added Group by in tree view
|
2019-11-21 10:22:51 +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 |
|
Daniel Barbero
|
17e7710f45
|
add datepicker alert correlation
|
2019-11-21 09:05:34 +01:00 |
|
artica
|
23e64ab781
|
Auto-updated build strings.
|
2019-11-21 00:01:18 +01:00 |
|
fbsanchez
|
624a1e0086
|
WIP alert correlation
|
2019-11-20 18:17:43 +01:00 |
|
Daniel Maya
|
fad70cfdc0
|
fixed secondary group in events
|
2019-11-20 16:34:56 +01:00 |
|
Daniel Barbero Martin
|
fb6013bd62
|
Wip alert correlation
|
2019-11-20 15:55:08 +01:00 |
|
fbsanchez
|
e9432aaaa5
|
Merge remote-tracking branch 'origin/develop' into ent-4769-modulos-ssh-php-perl
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
|
2019-11-20 15:51:47 +01:00 |
|
Daniel Barbero Martin
|
67fb2216d4
|
Fix
|
2019-11-20 09:48:35 +01:00 |
|
Daniel Barbero Martin
|
cd8f52fd92
|
WIP alert correlations
|
2019-11-20 09:11:03 +01:00 |
|
artica
|
12123d68df
|
Auto-updated build strings.
|
2019-11-20 00:01:37 +01:00 |
|
artica
|
04076a04b1
|
Auto-updated build strings.
|
2019-11-19 00:01:12 +01:00 |
|
Daniel Barbero
|
8811095a3e
|
WIP ALerts
|
2019-11-18 15:25:35 +01:00 |
|
Daniel Barbero
|
79f5e879cc
|
WIP Alerts
|
2019-11-18 13:37:10 +01:00 |
|
fbsanchez
|
443eb1168c
|
Merge remote-tracking branch 'origin/ent-EDF' into ent-4610-Alertas-de-logs
|
2019-11-18 12:48:31 +01:00 |
|
fbsanchez
|
6126503285
|
Merge remote-tracking branch 'origin/ent-4772-omnishell' into ent-EDF
|
2019-11-18 12:30:51 +01:00 |
|
fbsanchez
|
61ccd5bdbc
|
help_link omnishell
|
2019-11-18 12:30:12 +01:00 |
|
fbsanchez
|
85ca03b054
|
fix- removed traces
|
2019-11-18 11:07:04 +01:00 |
|
fbsanchez
|
99b0714850
|
PWE keep db connection up
|
2019-11-18 11:06:27 +01:00 |
|
José González
|
4cddf5a31a
|
Merge branch 'develop' into 'ent-4930-create_event-no-anade-comentarios-evento'
# Conflicts:
# pandora_console/include/functions_events.php
|
2019-11-18 11:02:31 +01:00 |
|
fbsanchez
|
6fb2e3af81
|
Merge remote-tracking branch 'origin/develop' into ent-EDF
|
2019-11-18 10:05:40 +01:00 |
|
artica
|
73389a7164
|
Auto-updated build strings.
|
2019-11-18 00:01:07 +01:00 |
|
artica
|
39b449be9c
|
Auto-updated build strings.
|
2019-11-17 00:01:07 +01:00 |
|
artica
|
727b3bde5d
|
Auto-updated build strings.
|
2019-11-16 00:01:11 +01:00 |
|
fbsanchez
|
46c42ef8a4
|
Merge remote-tracking branch 'origin/ent-4772-omnishell' into ent-EDF
|
2019-11-15 16:52:26 +01:00 |
|
fbsanchez
|
84c6640032
|
minor style fix
|
2019-11-15 16:51:53 +01:00 |
|
fbsanchez
|
32466a5f0f
|
Merge remote-tracking branch 'origin/develop' into ent-EDF
|
2019-11-15 16:36:06 +01:00 |
|
Alejandro Fraguas
|
7e8f22b1de
|
Merge branch 'ent-4936-Comillas-dobles-en-comentarios-de-eventos-no-funcionan' into 'develop'
Ent 4936 comillas dobles en comentarios de eventos no funcionan
See merge request artica/pandorafms!2869
|
2019-11-15 13:20:13 +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 |
|
artica
|
378192a449
|
Auto-updated build strings.
|
2019-11-15 00:01:12 +01:00 |
|
fbsanchez
|
8edbb74354
|
discovery help link and minor fixes
|
2019-11-14 21:52:02 +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
|
547e0c4364
|
Merge remote-tracking branch 'origin/ent-4772-omnishell' into ent-EDF
|
2019-11-14 20:58:16 +01:00 |