Commit Graph

24302 Commits

Author SHA1 Message Date
marcos ccd58897ee Add confirmation window 2020-04-27 16:40:50 +02:00
marcos ef30239cc6 add delete confirmation dialog 2020-04-24 16:43:18 +02:00
artica eb9b116311 Auto-updated build strings. 2020-04-24 01:00:16 +02:00
artica 1b641b81fb Auto-updated build strings. 2020-04-23 01:00:15 +02:00
artica 91d1832f8f Updated version and build strings. 2020-04-22 12:42:47 +02:00
Daniel Rodriguez 6e22e1919e Merge branch 'ent-5684-Se-ha-roto-la-vista-de-arbol' into 'develop'
Fix tree

See merge request artica/pandorafms!3153
2020-04-22 12:21:47 +02:00
Alejandro Fraguas 253312bdb3 Merge branch 'ent-5731-9922-agente-32-bit-no-funciona-error-compilacion' into 'develop'
Do not set ARCH if it was already set by other build scripts.

See merge request artica/pandorafms!3180
2020-04-22 12:11:52 +02:00
Ramon Novoa f061813769 Do not set ARCH if it was already set by other build scripts.
Ref pandora_enterprise#5731
2020-04-22 11:21:14 +02:00
artica 60f4f21297 Auto-updated build strings. 2020-04-22 01:00:15 +02:00
Daniel Rodriguez 59fc1f334f Merge branch 'ent-5733-bug-agent-alerts-list' into 'develop'
Fixed agent aler list

See merge request artica/pandorafms!3177
2020-04-21 18:12:49 +02:00
Luis Calvo d44aa7b1e1 Fixed agent aler list 2020-04-21 16:02:36 +02:00
Daniel Rodriguez f8b4e9ae4e Merge branch 'ent-5314-autodiscovery-2' into 'develop'
Ent 5314 autodiscovery 2

See merge request artica/pandorafms!3176
2020-04-21 13:44:52 +02:00
Kevin 629604aab4 Added plugin to sources, deleted from pandora_plugins 2020-04-21 13:21:32 +02:00
Kevin 8801b8a032 Merge branch 'develop' of brutus.artica.es:artica/pandorafms into ent-5314-autodiscovery-2 2020-04-21 13:10:43 +02:00
artica b3d7c56de4 Auto-updated build strings. 2020-04-21 01:00:18 +02:00
artica 3992b81900 Auto-updated build strings. 2020-04-20 01:00:19 +02:00
artica 2e44631253 Auto-updated build strings. 2020-04-19 01:00:15 +02:00
artica 04ecb0afa5 Auto-updated build strings. 2020-04-18 01:00:19 +02:00
Kevin 7dd99241f1 Merge remote-tracking branch 'origin/develop' into ent-5314-autodiscovery-2 2020-04-17 13:57:53 +02:00
artica 719762105d Auto-updated build strings. 2020-04-17 01:00:19 +02:00
Alejandro Fraguas fdced83e63 Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' into 'develop'
Fixes name resolution

See merge request artica/pandorafms!3167
2020-04-16 18:23:31 +02:00
fbsanchez 290abfe2ce fix css issue window shrink 2020-04-16 17:54:41 +02:00
fbsanchez b3ed5dab63 Update new ips detected 2020-04-16 14:29:35 +02:00
fbsanchez fa0b5760a9 simplified agents 2020-04-16 14:06:41 +02:00
fbsanchez 0614c4b6ce fix alias 2020-04-16 13:08:56 +02:00
fbsanchez f84760e448 Avoid candidates without label (indirect related) 2020-04-16 12:54:47 +02:00
fbsanchez f9c3d480ca Avoid empty references 2020-04-16 12:50:44 +02:00
fbsanchez bcb969c3af Fixes name resolution 2020-04-16 12:39:55 +02:00
Daniel Rodriguez eb379ddfa9 Merge branch 'ent-5565-9761-Macros-en-alertas-de-correlacion-de-eventos-no-funcionan' into 'develop'
fixed macros for alert of correlated events

See merge request artica/pandorafms!3161
2020-04-16 09:50:07 +02:00
artica 1b028be67f Auto-updated build strings. 2020-04-16 01:00:14 +02:00
Alejandro Fraguas 407b1b94c1 Merge branch 'ent-5690-Vulnerabilidad-critica-inyeccion-de-comandos-en-llamada-a-event-response' into 'develop'
Ent 5690 vulnerabilidad critica inyeccion de comandos en llamada a event response

See merge request artica/pandorafms!3159
2020-04-15 15:50:08 +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 a4bd4a4c5d Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' into 'develop'
minor style fix

See merge request artica/pandorafms!3166
2020-04-15 12:33:41 +02:00
fbsanchez 83b53e3eb7 minor style fix 2020-04-15 11:53:10 +02:00
Alejandro Fraguas afa53c3398 Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' into 'develop'
minor style change

See merge request artica/pandorafms!3164
2020-04-15 09:17:46 +02:00
artica e695a3f5b5 Auto-updated build strings. 2020-04-15 01:00:17 +02:00
Daniel Rodriguez 8e6792596e Merge branch 'ent-5314-autodiscovery-2' into 'develop'
deleted binaries from repo

See merge request artica/pandorafms!3162
2020-04-14 18:30:04 +02:00
Daniel Rodriguez 260508455e Merge branch 'revert-e1072c51' into 'develop'
Revert "Merge branch 'revert-24aa5d97' into 'develop'"

See merge request artica/pandorafms!3165
2020-04-14 18:29:28 +02:00
Daniel Rodriguez 9a087fe6c5 Revert "Merge branch 'revert-24aa5d97' into 'develop'"
This reverts merge request !3155
2020-04-14 18:27:56 +02:00
fbsanchez 282b31841d minor style change 2020-04-14 18:24:51 +02:00
Daniel Rodriguez 629d84ee87 Merge branch 'revert-414bb7ef' into 'develop'
Revert "Merge branch 'revert-a73c9ecb' into 'develop'"

See merge request artica/pandorafms!3163
2020-04-14 18:23:54 +02:00
Daniel Rodriguez b841fec72e Revert "Merge branch 'revert-a73c9ecb' into 'develop'"
This reverts merge request !3157
2020-04-14 18:22:00 +02:00
Kevin 6dc1dc4934 deleted binaries from repo 2020-04-14 18:05:05 +02:00
alejandro-campos 03db071ce4 fixed macros for alert of correlated events 2020-04-14 16:53:43 +02:00
Daniel Rodriguez 2445820d99 Merge branch 'ent-4176-8084-8169-actualizacion-selenium-firefox-wux' into 'develop'
Minor fix: avoid errors if no default vales flipflop (Origin:Wux)

See merge request artica/pandorafms!3073
2020-04-14 16:19:51 +02:00
fbsanchez 7024863fd7 Merge remote-tracking branch 'origin/develop' into ent-4176-8084-8169-actualizacion-selenium-firefox-wux
Conflicts:
	pandora_console/extras/mr/37.sql
2020-04-14 16:06:17 +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
Daniel Rodriguez 414bb7ef0d Merge branch 'revert-a73c9ecb' into 'develop'
Revert "Merge branch 'ent-5314-autodiscovery' into 'develop'"

See merge request artica/pandorafms!3157
2020-04-14 12:59:04 +02:00
Daniel Rodriguez 5965d2691d Revert "Merge branch 'ent-5314-autodiscovery' into 'develop'"
This reverts merge request !3144
2020-04-14 12:52:48 +02:00
Daniel Rodriguez e1072c51e1 Merge branch 'revert-24aa5d97' into 'develop'
Revert "Merge branch 'ent-5314-autodiscovery-2' into 'develop'"

See merge request artica/pandorafms!3155
2020-04-14 12:51:54 +02:00