tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
25,134 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

5216 Commits

Author SHA1 Message Date
Alejandro Fraguas 02bffc7e0d Merge branch 'ent-5935-Logs-de-la-consola-refactorizacion' into 'develop' 
changed console and audit log locations

See merge request artica/pandorafms!3278
 2020-06-25 15:28:13 +02:00
daniel 36e57ddd1d New report last value 2020-06-25 12:18:37 +02:00
fbsanchez a8671078f1 Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos 
Conflicts:
	pandora_console/install.php
 2020-06-25 11:25:43 +02:00
Daniel Rodriguez 5aef38dd72 Merge branch 'ent-5186-Texto-HTML-plano-en-apartado-de-los-reports-en-visual-styles' into 'develop' 
fixes in reports front page default setup

See merge request artica/pandorafms!3250
 2020-06-24 12:43:23 +02:00
Manuel Montes 549a17a428 Ent 5470 se duplican los sistemas operativos 2020-06-23 14:45:04 +02:00
Alejandro Campos 9ce4c90456 Merge branch 'develop' into 'ent-5186-Texto-HTML-plano-en-apartado-de-los-reports-en-visual-styles' 
# Conflicts:
#   pandora_console/godmode/setup/setup_visuals.php
 2020-06-23 10:04:24 +02:00
alejandro-campos cec16d01b8 Merge branch 'develop' into ent-5935-Logs-de-la-consola-refactorizacion 2020-06-23 09:56:21 +02:00
Alejandro Campos a81e4acbb7 Merge branch 'develop' into 'ent-6030-Problema-de-codificacion' 
# Conflicts:
#   pandora_console/include/functions_config.php
 2020-06-23 09:28:21 +02:00
alejandro-campos 6520ad2107 Added setup token 2020-06-23 09:21:15 +02:00
Alejandro Fraguas 7be71080eb Merge branch 'ent-5959-xxs-special-day' into 'develop' 
ignore keys xss special days

See merge request artica/pandorafms!3323
 2020-06-22 09:37:07 +02:00
Alejandro Fraguas 487ab4e86a Merge branch 'ent-5956-xss-manage-agent-group' into 'develop' 
ignore keys on xss manage angent groups

See merge request artica/pandorafms!3322
 2020-06-22 09:25:05 +02:00
alejandro-campos d64ff918d6 Merge branch 'develop' into ent-5935-Logs-de-la-consola-refactorizacion 2020-06-19 12:22:28 +02:00
alejandro-campos 1243968872 Merge branch 'develop' into ent-5935-Logs-de-la-consola-refactorizacion 2020-06-19 12:12:52 +02:00
marcos 1f4de3ee4d ignore keys xss special days 2020-06-19 10:53:14 +02:00
marcos 415a8aa8b6 ignore keys on xss manage angent groups 2020-06-19 10:44:43 +02:00
marcos 40c0d4ea09 fixed error 2020-06-18 17:09:22 +02:00
Jose Gonzalez 1805a0910e Changed query for get default actions in templates 2020-06-18 16:53:32 +02:00
marcos f3de739a7c fixed visual error tag meta 2020-06-18 15:30:55 +02:00
Luis 28da2b9afb Ent 5473 report template inventory 2020-06-18 13:19:04 +02:00
Alejandro Fraguas dbdf5edd0c Merge branch 'ent-636-Campos-Target-IP-y-Export-target-en-politicas' into 'develop' 
Changed target ip selector in WMI server policy modules

See merge request artica/pandorafms!3186
 2020-06-17 17:49:12 +02:00
alejandro-campos 9f4fed57b1 Merge branch 'develop' into ent-636-Campos-Target-IP-y-Export-target-en-politicas 2020-06-17 15:27:14 +02:00
fbsanchez 225b82233c Merge remote-tracking branch 'origin/develop' into ent-5778-9834-db2-para-discovery 2020-06-17 10:13:28 +02:00
fbsanchez 1eea17f9b9 Merge remote-tracking branch 'origin/develop' into ent-5527-cambio-discovery-sap-para-hacerlo-personalizable 2020-06-15 17:41:53 +02:00
Alejandro Fraguas 495b13f387 Merge branch 'ent-5959-xxs-special-day' into 'develop' 
fixed vulnerability on special days

See merge request artica/pandorafms!3286
 2020-06-15 12:14:42 +02:00
Alejandro Fraguas 80774e9942 Merge branch 'ent-5956-xss-manage-agent-group' into 'develop' 
fixed security error on manage agent group

See merge request artica/pandorafms!3288
 2020-06-15 10:33:50 +02:00
Alejandro Fraguas 62ce710b5b Merge branch 'ent-5954-XSS-Tags' into 'develop' 
Control vulnerable fields

Closes pandora_enterprise#5954

See merge request artica/pandorafms!3283
 2020-06-15 10:02:20 +02:00
Alejandro Fraguas af8326c042 Merge branch 'ent-5952-XSS-Netscan' into 'develop' 
fix XSS

See merge request artica/pandorafms!3282
 2020-06-15 09:33:08 +02:00
Daniel Rodriguez 146879ee8d Merge branch 'ent-5856-Se-pierde-filtro-al-paginar-en-REPORTS' into 'develop' 
Fixed errors filter search with pagination

See merge request artica/pandorafms!3226
 2020-06-15 08:29:14 +02:00
fbsanchez b4219472f2 Merge remote-tracking branch 'origin/develop' into ent-5778-9834-db2-para-discovery 2020-06-11 14:55:36 +02:00
fbsanchez 057fcea724 DB2 discovery 2020-06-11 14:53:34 +02:00
Daniel Rodriguez d3a34c5f00 Merge branch 'ent-5779-open-aviso-de-exclusividad-de-enterprise-en-bulk-operations' into 'develop' 
Fix #5779

See merge request artica/pandorafms!3233
 2020-06-11 14:03:14 +02:00
Daniel Rodriguez a8328bd4f1 Merge branch 'ent-5568-case-insensitive-para-el-buscador-de-usuarios' into 'develop' 
Ent 5568 case insensitive para el buscador de usuarios

See merge request artica/pandorafms!3244
 2020-06-11 14:00:52 +02:00
Jose Gonzalez da52e0f739 Changed nothing option for avoid duplicates 2020-06-10 16:00:23 +02:00
Jose Gonzalez 599445ad4d Solved issue with thresholds in prediction modules 2020-06-09 16:05:24 +02:00
marcos b3a270d0b3 fixed security error on manage agent group 2020-06-09 12:43:58 +02:00
marcos 9ddfde1774 fixed error with update event comments 2020-06-09 12:02:31 +02:00
marcos cfe30d5b7d fixed vulnerability on special days 2020-06-09 10:37:11 +02:00
alejandro-campos 442b40ad97 Merge branch 'develop' into ent-636-Campos-Target-IP-y-Export-target-en-politicas 2020-06-09 09:30:16 +02:00
Jose Gonzalez 120b78b5c5 Control vulnerable fields 2020-06-08 17:36:32 +02:00
alejandro-campos 754023f908 fix XSS 2020-06-08 17:12:33 +02:00
fbsanchez 11dbe46a96 Allowed toggled rows 2020-06-08 15:23:09 +02:00
alejandro-campos ab61cf1fc5 changed console and audit log locations 2020-06-08 10:48:48 +02:00
Alejandro Fraguas a8bf9843ee Merge branch 'ent-5728-bug-standard-users-pandora-administrator' into 'develop' 
Fixed user list for UM

See merge request artica/pandorafms!3241
 2020-06-08 10:46:37 +02:00
Daniel Barbero Martin 44b2c59572 Fixed error link builder in VC 2020-06-05 11:01:00 +02:00
Jose Gonzalez 6690bfdad8 Blocked create and update of remote component group when meta has centralized management 2020-06-04 21:07:53 +02:00
Daniel Rodriguez 86afda25fe Merge branch 'ent-5673-Mala-visualizacion-de-modulos-con-caracteres-japones' into 'develop' 
Fixed errors encoding

See merge request artica/pandorafms!3234
 2020-06-02 17:24:11 +02:00
Daniel Rodriguez 2e79394288 Merge branch 'fix-disable-enable-agent' into 'develop' 
Fixed the problem that agents cannot be enabled/disabled with open version.

See merge request artica/pandorafms!3191
 2020-06-02 09:54:40 +02:00
Daniel Rodriguez df1fe544a1 Merge branch 'ent-5756-pantallas-de-configuracion-del-cluster' into 'develop' 
Ent 5756 pantallas de configuracion del cluster

See merge request artica/pandorafms!3205
 2020-06-01 09:47:25 +02:00
Daniel Maya a56ee5dac5 Ent 5648 querier avanzado en la vista de log collector 2020-05-29 13:07:53 +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 476ebe70a7 fixes in reports front page default setup 2020-05-28 14:47:36 +02:00
Manuel Montes 2ae11577ce Added case insensitive in agent search 2020-05-26 14:42:06 +02:00
Luis Calvo 24ddb370a7 Fixed user list for UM 2020-05-26 13:38:03 +02:00
fbsanchez 37058537aa Fix #5779 2020-05-25 17:06:23 +02:00
Daniel Barbero Martin db32fedde4 Fixed errors encoding 2020-05-25 17:06:20 +02:00
fbsanchez f3d9f2d75e Cluster view RC1 2020-05-22 13:13:19 +02:00
fbsanchez e66f33fd37 WIP Cluster references updated 2020-05-22 12:14:01 +02:00
Daniel Barbero Martin a73ec18867 Fixed errors filter search with pagination 2020-05-21 09:13:39 +02:00
alejandro-campos 7abd17285a Merge branch 'develop' into ent-5415-Bugs-password-policy 2020-05-19 17:39:55 +02:00
alejandro-campos 706738d801 fixed password length check in user update for admin user 2020-05-19 15:58:41 +02:00
Tatiana Llorente b99298786e Ent 5754 editor de usuarios de godmode que sea visualmente similar al editor de usuarios el propio usuario 2020-05-19 08:20:04 +02:00
Alejandro Fraguas aaf64e591c Merge branch 'ent-5708-review-discovery-h-d' into 'develop' 
Ent 5708 review discovery h d

See merge request artica/pandorafms!3195
 2020-05-14 10:32:43 +02:00
Tatiana Llorente 1f16abd4bd Ent 5701 quitar feature de chat 2020-05-08 15:39:24 +02:00
Daniel Rodriguez b655094f3a Merge branch 'ent-5619-se-muestran-2-veces-el-mensaje-de-realizado' into 'develop' 
duplicated enable/disable message

See merge request artica/pandorafms!3128
 2020-05-08 15:38:24 +02:00
tatiana 490213dfed Changed path in a required file 2020-05-05 12:50:15 +02:00
fbsanchez 4815dce8aa H&D port filtering + control tasks cancellation while restarting server 2020-05-04 11:13:15 +02:00
fbsanchez 900e25eef1 WIP rcmd in H&D 2020-04-30 15:00:25 +02:00
Junichi Satoh 788c39008e Fixed the problem that agent cannot be enabled/disabled with open version. 2020-04-30 15:50:45 +09:00
alejandro-campos 086bc28986 Changed target ip selector in WMI server policy modules 2020-04-27 17:27:54 +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
fbsanchez edb3059a09 minor style fix 2020-04-14 12:32:54 +02:00
fbsanchez 3b71297d56 escaped single quotes (wmi) + refresh button 2020-04-14 11:57:18 +02:00
fbsanchez 13a1e44a5e operation icons on small screens 2020-04-13 19:34:36 +02:00
fbsanchez 58eeffd04d clearer maps 2020-04-13 18:28:56 +02:00
Jose Gonzalez 3fd09c9828 WIP: Reverse develop version for agent_wizard 2020-04-13 17:30:21 +02:00
fbsanchez 748582509a avoid process csv while updating task with no csv changes 2020-04-08 12:29:44 +02:00
fbsanchez 95d7a5d267 minor fix 2020-04-08 12:26:01 +02:00
fbsanchez 47857de79f some css adjustments 2020-04-08 11:48:31 +02:00
fbsanchez 5c405b1d32 Merge remote-tracking branch 'origin/develop' into ent-4176-8084-8169-actualizacion-selenium-firefox-wux 2020-04-08 10:18:13 +02:00
fbsanchez 56e9275b1a minor fix 2020-04-07 19:10:37 +02:00
fbsanchez 762ad3106d Improvements and fixes H&D with review 2020-04-07 18:50:56 +02:00
Jose Gonzalez 1a080a4e3a WIP: Backup upload 2020-04-07 16:41:33 +02:00
fbsanchez d5faabbff5 minor fix review with limitations 2020-04-07 12:43:44 +02:00
Daniel Rodriguez bcaf37c60c Merge branch 'ent-5659-ventana-modal-de-la-vista-de-mapa-discovery-task-se-va' into 'develop' 
fixed error with dialog task list

See merge request artica/pandorafms!3139
 2020-04-07 10:57:12 +02:00
fbsanchez 194c6d6a9a Excluded PENed templates from select 2020-04-06 18:26:55 +02:00
fbsanchez c743a2b204 minor fix 2020-04-06 14:32:20 +02:00
fbsanchez 6cb9b06cea minor fix, license limits while reapplying queue 2020-04-06 13:42:39 +02:00
fbsanchez 3f9bdf65df minor fixes and target selection (buttons) 2020-04-06 13:00:09 +02:00
marcos 3a688c6b3d update task list dialog 2020-04-06 12:29:37 +02:00
fbsanchez 5205e0e06f minor update 2020-04-06 12:05:03 +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
fbsanchez 1523dca9b2 Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' of brutus.artica.es:artica/pandorafms into ent-5575-wizard-de-modulos-y-recon-by-steps 2020-04-06 11:04:57 +02:00
fbsanchez 72f026f152 Minor fixes, group and review while exceeded license 2020-04-06 11:04:53 +02:00
Jose Gonzalez a6ce19db66 WIP: Backup upload 2020-04-06 09:49:59 +02:00
Jose Gonzalez 5c04c6c03b Minor fixes with data 2020-04-03 12:55:48 +02:00
Daniel Rodriguez 89e7d1921f Merge branch 'ent-5657-al-añadir-accion-en-la-lista-de-alertas-el-dialogo-modal-no-muestra-en-nombre-de-agente' into 'develop' 
fixed minnnor error

See merge request artica/pandorafms!3137
 2020-04-03 12:06:50 +02:00
marcos f229dada52 fixed minnnor error 2020-04-02 19:02:14 +02:00
Daniel Rodriguez 81e7e9a7d9 Merge branch 'ent-5656-Admin-lista-de-usuarios-cambios-menores-en-la-visualizacion' into 'develop' 
minor visual changes

See merge request artica/pandorafms!3132
 2020-04-02 15:25:40 +02:00
Luis bcd9aabcd8 Ent 5604 policy modules japanese bug 2020-04-02 14:30:02 +02:00