Commit Graph

23461 Commits

Author SHA1 Message Date
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
marcos fbb1e53362 update orderinterpreter 2019-12-04 17:28:03 +01:00
Daniel Maya 2b8e9995ce Added stopPropagation 2019-12-04 17:14:45 +01:00
artica 0ba2d86971 Auto-updated build strings. 2019-12-04 00:01:08 +01:00
fbsanchez ee9694d968 Merge branch 'ent-fix-elk-alerts' into 'develop'
Fix ELK alerts

See merge request artica/pandorafms!2936
2019-12-03 20:19:24 +01:00
fbsanchez a8a1b2bcc8 Fix ELK alerts 2019-12-03 19:54:09 +01:00
marcos 1f97fcef40 update css and preg_match 2019-12-03 18:31:13 +01:00
marcos 7eec91b946 Show result in normal window 2019-12-03 18:19:32 +01:00
vgilc 516fa8569b Merge branch 'revert-80962856' into 'develop'
Revert "Merge branch 'ent-4968-Comandos-de-alerta-con-saltos-de-linea' into 'develop'"

See merge request artica/pandorafms!2935
2019-12-03 16:01:56 +01:00
vgilc 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
vgilc 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
marcos 14b8379ccb ajax call, controller, class, match result, return array inputs(example to return) 2019-12-03 15:11:16 +01:00
marcos 631170bfe9 resolv blank page 2019-12-03 14:26:31 +01:00
marcos 90f17ebd46 Merge remote-tracking branch 'origin/develop' into ent-4467-barra-de-busqueda-como-interprete-de-ordenes 2019-12-03 14:15:47 +01:00
marcos d4720c2260 add firts changes 2019-12-03 13:59:03 +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
Tatiana Llorente fecd2c74b5 Added button to refresh graph in container graphs 2019-12-03 13:00:59 +01:00
artica 60aaf4363e Auto-updated build strings. 2019-12-03 00:01:07 +01:00
marcos d7288114ad fixed minnor error 2019-12-02 18:17:54 +01:00
Tatiana Llorente 2d62955020 Changed filters styles in netflow live view 2019-12-02 16:11:17 +01:00
Jose Gonzalez 6883240931 Added control for int values 2019-12-02 11:54:39 +01:00
marcos e412516a64 add historical data fialure message 2019-12-02 11:20:25 +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
marcos a67b0a9978 update pandora.js pandora_ui.js 2019-11-28 18:27:05 +01:00
Tatiana Llorente 0420a439d1 Send params to copy and delete action alert by post 2019-11-28 11:51:32 +01:00
marcos 99eb67c251 Merge remote-tracking branch 'origin/develop' into ent-4876-pandora_ui.js 2019-11-28 10:02:43 +01:00
artica ec6d317bd4 Auto-updated build strings. 2019-11-28 00:01:09 +01:00
daniel f4b347c632 Merge branch 'ent-4989-Revision-final-EDFi-741-PDF' into 'develop'
Fixed pdf

See merge request artica/pandorafms!2922
2019-11-27 15:24:49 +01:00
Daniel Barbero Martin e6afe84940 Fixed pdf 2019-11-27 15:22:39 +01:00
marcos d910c53b73 add coments 2019-11-27 15:06:16 +01:00
manuel a799b22a5c Fixed bug in network tools 2019-11-27 14:06:52 +01:00
Daniel Rodriguez 50b4812476 Merge branch 'ent-4571-expresiones-regulares-en-plantillas-de-informe' into 'develop'
Added report template regex to MR

See merge request artica/pandorafms!2820
2019-11-27 13:21:05 +01:00
Luis b0d5b7223e Added report template regex to MR 2019-11-27 13:21:05 +01:00
Daniel Rodriguez b64218cedb Merge branch 'ent-4226-Mejoras-plugin-SAP' into 'develop'
Fixed translate

See merge request artica/pandorafms!2919
2019-11-27 11:52:12 +01:00
Daniel Barbero Martin ea2c5bc8c9 Fixed translate 2019-11-27 11:49:20 +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
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
Daniel Rodriguez becaad2447 Merge branch 'ent-EDF' into 'develop'
Ent edf

See merge request artica/pandorafms!2890
2019-11-26 18:38:49 +01:00
fbsanchez bf22ff7a50 minor fixes 2019-11-26 17:08:18 +01:00
Tatiana Llorente d8e1786830 Added Save Operation Mode option in agents bulk operations 2019-11-26 16:44:53 +01:00
fbsanchez c28dfd60a5 Merge remote-tracking branch 'origin/develop' into ent-EDF 2019-11-26 16:16:15 +01:00
fbsanchez 69b813390d minor fix - removed trace 2019-11-26 15:49:28 +01:00
fbsanchez a4db8483d1 Discovery Applications minor fixes - SAP backend 2019-11-26 15:47:04 +01:00