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

5379 Commits

Author SHA1 Message Date
Luis Calvo 37a97cd2ad Added link to credential store from module creation 2020-07-07 10:26:19 +02:00
fbsanchez cf26293a33 WIP massive services 2020-07-06 19:35:31 +02:00
alejandro-campos 0ef7ff1198 fix empty check condition 2020-07-06 14:35:22 +02:00
fbsanchez 534aa8c7c5 Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos 2020-07-06 14:31:55 +02:00
marcos 4ad7735dd7 resolved error with duplucated modules 2020-07-06 10:09:36 +02:00
Luis Calvo 76d724321f Fixed report sendmail success message 2020-07-03 14:18:30 +02:00
alejandro-campos 63df6c15f0 Merge branch 'develop' into ent-6030-Problema-codificacion 2020-07-01 16:39:00 +02:00
Luis Calvo 88d72b3d66 Fixed minor bug field10 param 2020-07-01 14:41:31 +02:00
manuel.montes 5502ee6b01 Fixed bug in module manage meta 2020-07-01 10:16:55 +02:00
fbsanchez faaf14bfd4 Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos 
Conflicts:
	pandora_console/extras/mr/39.sql
	pandora_console/include/lib/Module.php
 2020-06-30 17:04:33 +02:00
José González 311b259684 Backup upload 2020-06-30 12:16:51 +02:00
Daniel Maya db452f41f5 Added trim in address 2020-06-26 10:11:41 +02:00
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
Jose Gonzalez 933bdef165 Added solution for multiple template delete 2020-04-02 08:10:37 +02:00
alejandro-campos 6d6b891650 minor visual changes 2020-04-01 17:32:22 +02:00
fbsanchez e249233205 minor fixes 2020-04-01 16:43:04 +02:00
Jose Gonzalez 1b8fa26193 Minor fixes applied 2020-04-01 16:36:06 +02:00
Jose Gonzalez 6be6e19ad3 WIP: Ready for testing 2020-04-01 16:21:28 +02:00
Jose Gonzalez 4f2ad67f58 WIP: Deleted legacy menu entry 2020-04-01 13:13:31 +02:00
marcos a2ee59e5b0 duplicated enable/disable message 2020-03-31 17:35:01 +02:00
alejandro-campos 297672ec48 fix password checkings when pass policy is enabled 2020-03-31 15:12:39 +02:00
Jose Gonzalez a715b7d74a WIP 2020-03-31 13:00:07 +02:00
Jose Gonzalez 4c332a3543 WIP: Must do low changes 2020-03-31 10:47:00 +02:00
fbsanchez acabe543c4 csv recon0 2020-03-30 19:44:44 +02:00
Jose Gonzalez 85765099ea 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-03-30 17:01:03 +02:00
Jose Gonzalez d09c5f355b WIP: Fixes and refactor 2020-03-30 17:00:48 +02:00
fbsanchez 6ea901e7ee Limitations 2020-03-30 15:07:05 +02:00
fbsanchez c556bf3ba8 License validation 2020-03-30 15:03:22 +02:00
fbsanchez a7c783242d Remaining stuff 2020-03-30 12:51:52 +02:00
Jose Gonzalez e883312038 Modified menu 2020-03-30 08:22:07 +02:00
Jose Gonzalez 4e019fe193 Modified name for Network component to Remote component 2020-03-27 13:47:49 +01:00
fbsanchez dffaafbf6a 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-03-27 11:42:09 +01:00
fbsanchez 3a74e25068 PEN management 2020-03-27 11:41:56 +01:00
Jose Gonzalez 75de601f57 Forms modified for be able add raw inputs 2020-03-27 08:51:17 +01:00
fbsanchez 452f5253e2 merge develop 2020-03-26 14:43:57 +01:00
Jose Gonzalez 161c1eb643 WIP: Minor fixes 2020-03-26 14:41:54 +01:00
fbsanchez e48ef76f35 merge 2020-03-26 14:38:23 +01:00
daniel 709201bf23 dashboards 2020-03-26 12:29:38 +01:00
Jose Gonzalez 2b21266a38 WIP: At this point, PEN form is operative and functional 2020-03-26 12:17:28 +01:00
Jose Gonzalez 86cbecc9a0 WIP: PEN form near to clear 2020-03-26 09:04:10 +01:00
fbsanchez fecff8aa93 Discovery review advanced 2020-03-25 18:02:58 +01:00
Jose Gonzalez 3a5e7b08e5 WIP: Added class and page for PENs management 2020-03-24 15:14:57 +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
Jose Gonzalez 2e4de8664e WIP: Changes in menu 2020-03-24 08:04:37 +01:00
Jose Gonzalez 8523d6e429 WIP: Modify menu to apply the proper changes 2020-03-24 07:54:29 +01:00
fbsanchez 23c19856b8 minor fixes 2020-03-23 19:09:22 +01:00
Jose Gonzalez c18d339730 WIP: Backup upload 2020-03-23 15:16:54 +01:00
Daniel Rodriguez ce249275e4 Merge branch 'ent-5138-9245-Metaconsola-Sincronizacion-de-grupos-cuando-se-eliminan' into 'develop' 
Ent 5138 9245 metaconsola sincronizacion de grupos cuando se eliminan

See merge request artica/pandorafms!3112
 2020-03-23 13:04:16 +01:00
Daniel Rodriguez 1dddb6d81a Merge branch 'ent-5509-Resumen-erroneo-de-borrado-en-OPERACIONES-MASIVAS' into 'develop' 
Ent 5509 resumen erroneo de borrado en operaciones masivas

See merge request artica/pandorafms!3085
 2020-03-23 13:01:34 +01:00
alejandro-campos e05c292d7d show last status change of module 2020-03-23 12:47:58 +01:00
Daniel Maya c7e6f9fd34 Added disable event in alert template 2020-03-23 11:34:37 +01:00
Jose Gonzalez 29dcc8bc78 WIP: Backup upload 2020-03-20 15:35:30 +01:00
Tatiana Llorente e0b69bbe3e Ent 5101 9223 eliminacion de agentes en nodo no elimina agentes en politica de meta 2020-03-20 12:34:58 +01:00
fbsanchez 72b6e7f81a 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-03-19 18:33:09 +01:00
fbsanchez 17eae7d97f updates 2020-03-19 18:33:04 +01:00
Jose Gonzalez 7bf5764081 Added CSS changes. WIP: Backup upload 2020-03-19 18:24:52 +01:00
Jose Gonzalez cca11f2341 WIP: Backup upload 2020-03-19 16:14:38 +01:00
tatiana e939ac05a8 Delete groups in nodes when deleting in meta - #5138 2020-03-19 13:11:06 +01:00
fbsanchez f58276ddbb Templates 2020-03-18 19:31:58 +01:00
Tatiana Llorente 8c86019037 Ent 5583 bug comando de alerta 2020-03-18 12:25:29 +01:00
fbsanchez b860c49383 target selections 2020-03-17 18:34:30 +01:00
Jose Gonzalez c1337a4318 WIP: Backup upload 2020-03-17 18:27:56 +01:00
Jose Gonzalez 40958ae69d WIP: Backup upload 2020-03-17 16:24:17 +01:00
Jose Gonzalez 142823eef6 WIP: Backup upload 2020-03-17 13:46:10 +01:00
fbsanchez 3a4deddc4b 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-03-16 23:52:34 +01:00
fbsanchez f3da919abc WIP multiple changes 2020-03-16 23:52:20 +01:00
Jose Gonzalez 106f8bd1cf Created new files with Module Blocks and changed Menu entries 2020-03-16 20:48:38 +01:00
Daniel Rodriguez e1e76595a5 Merge branch 'ent-5365-Pestana-de-acciones-de-alertas-sin-paginacion' into 'develop' 
Ent 5365 pestana de acciones de alertas sin paginacion

See merge request artica/pandorafms!3087
 2020-03-16 17:19:32 +01:00
Tatiana Llorente c7bb4f5a95 Ent 5548 usabilidad en el editor de modulos 2020-03-16 16:35:01 +01:00
Daniel Maya fc88d265d4 Added group filter in alert list 2020-03-16 15:42:10 +01:00
fbsanchez ce11d89953 Frontent changes 2020-03-13 14:03:50 +01:00
Daniel Maya a7fdd4cc20 change in metaconsole advanced setup 2020-03-11 16:21:25 +01:00
fbsanchez f0a71e01de minor fixes 2020-03-11 13:35:31 +01:00
Luis 6721e4f5ab Ent 5446 bug creating netflow filter 2020-03-11 11:32:21 +01:00
fbsanchez 9211396134 Merge remote-tracking branch 'origin/develop' into ent-4176-8084-8169-actualizacion-selenium-firefox-wux 2020-03-10 15:40:16 +01:00
Daniel Rodriguez 97f3902cf4 Merge branch 'ent-5431-Filtro-de-usuarios' into 'develop' 
fix bad parameter in function call

See merge request artica/pandorafms!3068
 2020-03-10 12:11:29 +01:00
fbsanchez fd23ed30c5 Merge remote-tracking branch 'origin/develop' into ent-4176-8084-8169-actualizacion-selenium-firefox-wux 2020-03-04 11:37:35 +01:00
Tatiana Llorente d799ac0739 Added pagination and filter box in alert actions - #5365 2020-03-02 16:17:45 +01:00
Tatiana Llorente c8e492b194 Moved creation button to right side in visual maps - #5404 2020-03-02 11:41:54 +01:00
Tatiana Llorente 13466536bd Show correct counter of deleted alerts - #5509 2020-03-02 11:23:20 +01:00
fbsanchez b125f7618e browser option in wux modules 2020-02-27 18:41:28 +01:00
Luis 82fe47cfd9 Ent 5312 snmp browser enchancements 2020-02-27 16:31:09 +01:00
Tatiana Llorente ec57540fb0 Ent 5432 libreria de modulos de pandora integrada en consola 2020-02-27 11:20:24 +01:00
Daniel Rodriguez 43ca1bdc5d Merge branch 'ent-5336-SNMP-Interface-Wizard' into 'develop' 
Fixed when you select 'show all modules' and the module is not from the interface

See merge request artica/pandorafms!3056
 2020-02-24 14:30:49 +01:00
alejandro-campos 4bdea42c63 fix bad parameter in function call 2020-02-24 13:16:22 +01:00
Daniel Barbero Martin 6ccc606c74 Merge remote-tracking branch 'origin/develop' into ent-5408-consola-visual-nueva-bugs 2020-02-20 08:06:59 +01:00
Daniel Rodriguez ab568bdb52 Merge branch 'ent-5488-Mala-redireccion-en-wizard-de-wmi-que-inhabilita-la-funcionalidad' into 'develop' 
fix bug in form action

See merge request artica/pandorafms!3065
 2020-02-19 11:30:34 +01:00
marcos e265bc2970 Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens 2020-02-19 09:31:31 +01:00
Alejandro Fraguas 1acfaa9cdc Merge branch 'ent-5429-Cambios-en-el-editor-de-modulos' into 'develop' 
Ent 5429 cambios en el editor de modulos

See merge request artica/pandorafms!3052
 2020-02-18 14:03:36 +01:00
alejandro-campos 65b3b1dc36 fix bug in form action 2020-02-18 13:47:47 +01:00
marcos 7564249207 Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens 2020-02-17 16:15:29 +01:00
Daniel Barbero Martin 10972a2364 Fix bug icon builder view not legacy mode 2020-02-13 08:45:25 +01:00
Daniel Rodriguez 5d436d214b Merge branch 'ent-4740-revision-completa-de-informes-templates-en-nodo' into 'develop' 
Fixed bug in prediction report item 4740

See merge request artica/pandorafms!2872
 2020-02-11 15:39:26 +01:00
Daniel Maya e65de54f39 Fixed when you select 'show all modules' and the module is not from the interface 2020-02-10 15:46:04 +01:00
Alejandro Fraguas 0538bd5185 Merge branch 'ent-5227-Problema-encoding-aplicación-politicas' into 'develop' 
Ent 5227 problema encoding aplicación politicas

See merge request artica/pandorafms!3055
 2020-02-10 12:14:19 +01:00
Manuel Montes 4f14921e85 Fixed bug in reports 2020-02-10 11:40:33 +01:00
alejandro-campos b658fddfc2 visual changes in module creation 2020-02-07 13:58:26 +01:00
Jose Gonzalez 5b08e71ec6 Solved issue with UTF8 chars in configuration_data field 2020-02-06 13:02:58 +01:00
Daniel Rodriguez 1cca736953 Merge branch 'ent-4788-Icono-GIS-en-Setup-desaparecido' into 'develop' 
Ent 4788 icono gis en setup desaparecido

See merge request artica/pandorafms!2843
 2020-02-05 12:35:50 +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
Daniel Rodriguez 32cb47fb71 Merge branch 'ent-5251-9432-No-se-pueden-crear-usuarios-con-password-policy-activado' into 'develop' 
Fixed password policy

See merge request artica/pandorafms!3020
 2020-02-03 16:06:43 +01:00
Alejandro Fraguas 6aae378b37 Merge branch 'ent-4533-descuadre-visual-usuarios-metaconsola' into 'develop' 
ajuste visual en tabla user management

See merge request artica/pandorafms!2682
 2020-02-03 13:55:42 +01:00
alejandro-campos 73f3dfac85 fix module string data with html special chars breaking html in page 2020-01-31 11:53:42 +01:00
marcos d5016d4943 Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens 2020-01-28 10:08:01 +01:00
Daniel Barbero Martin 0dabab11cf Merge remote-tracking branch 'origin/develop' into new-vc-line-element 
Conflicts:
	pandora_console/install.php
 2020-01-27 16:19:32 +01:00
Daniel Rodriguez 28392b71ef Merge branch 'ent-5066-9061-Crear-Failover-en-Informe-de-disponibilidad' into 'develop' 
availability failover

See merge request artica/pandorafms!3015
 2020-01-27 10:48:50 +01:00
Daniel Barbero Martin aea073b4d5 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-24 11:41:35 +01:00
Daniel Barbero Martin fe697a98ec fixed errors VC 2020-01-23 19:54:47 +01:00
marcos 79a34ac756 Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens 2020-01-23 11:06:15 +01:00
vgilc 2447514c41 Merge branch 'ent-4259-el-id-del-agente-con-remote-config-se-corta-en-la-vista-de-manage-resolucion-portatil' into 'develop' 
Fix visual problems with agent details

See merge request artica/pandorafms!2625
 2020-01-23 10:11:35 +01:00
Daniel Barbero Martin 6c6403336f Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-23 08:14:24 +01:00
marcos 823fb30db7 Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens 2020-01-22 13:42:58 +01:00
vgilc 69d9051339 Merge branch 'ent-5172-metaconcola-informes-ajustes-para-agrupados' into 'develop' 
Fixed visual bug in grouped report item

See merge request artica/pandorafms!2992
 2020-01-22 12:20:05 +01:00
Daniel Maya 32b28bea0c Added warning in update manager offline 2020-01-22 11:10:02 +01:00
Daniel Maya 428e0ffbd7 Fixed password policy 2020-01-21 17:31:21 +01:00
marcos 76ed257287 Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens 2020-01-21 15:23:26 +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
Alejandro Campos e7769b8bf4 Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024' 
# Conflicts:
#   pandora_console/extras/mr/35.sql
 2020-01-20 12:00:42 +01:00
Daniel Barbero Martin 536af6f33a Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-19 11:37:18 +01:00
Daniel Rodriguez 96eebe4310 Merge branch 'ent-5135-No-funciona-la-exploracion-SNMP-remota' into 'develop' 
Added port option on server configuration to be used when connecting to execution server

See merge request artica/pandorafms!3012
 2020-01-17 14:40:58 +01:00
alejandro-campos 8778553cca Merge branch 'ent-5135-No-funciona-la-exploracion-SNMP-remota' of https://brutus.artica.es:8081/artica/pandorafms into ent-5135-No-funciona-la-exploracion-SNMP-remota 2020-01-16 17:42:45 +01:00
alejandro-campos fb7cb57f03 added check to disable satellite servers from exec servers available in snmp wizard in case it is not a satellite agent or has remote config 2020-01-16 17:42:31 +01:00
Daniel Barbero Martin d5e21499c2 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-16 14:08:07 +01:00
Tatiana Llorente 0980c9a74a Ent 5261 cambio de control de intervalo en alertas 2020-01-16 13:50:39 +01:00
Marcos Alconada 5268c23c7a Merge branch 'develop' into 'ent-4705-encriptado-de-nuevos-tokens' 
# Conflicts:
#   pandora_console/include/functions_config.php
 2020-01-16 09:23:42 +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
Daniel Maya c68f83f013 availability failover 2020-01-15 17:16:46 +01:00
Alejandro Campos c389769602 Merge branch 'develop' into 'ent-5135-No-funciona-la-exploracion-SNMP-remota' 
# Conflicts:
#   pandora_console/extras/mr/35.sql
 2020-01-15 17:12:32 +01:00
alejandro-campos d9062def99 Merge branch 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024' of https://brutus.artica.es:8081/artica/pandorafms into ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024 2020-01-15 16:01:11 +01:00
alejandro-campos 3f26f2ef6f fix bug when deleting custom units and changed default value for byte multiplier 2020-01-15 16:00:33 +01:00
alejandro-campos 8b6c1261a9 change order of form port input 2020-01-15 15:37:42 +01:00
alejandro-campos 5eb2953810 Added port option on server configuration to be used when connecting to execution server 2020-01-14 15:43:17 +01:00
Tatiana Llorente 95600412e1 Minor visual changes in alert list 2020-01-14 13:14:09 +01:00
Alejandro Campos dcd2aae3c5 Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024' 
# Conflicts:
#   pandora_console/extras/mr/35.sql
 2020-01-14 10:28:55 +01:00
Daniel Barbero ed53399c3c Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-14 09:34:31 +01:00
Daniel Maya 7204e7c0f2 Ent 4862 mas opciones en los filtros de severidad 2020-01-13 18:24:29 +01:00
Luis db49db3711 report font not depending of custom report front enabled 2020-01-13 18:21:48 +01:00
Daniel Maya 49e03f5e44 Fixed XSS vulnerability 2020-01-13 11:29:18 +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
alejandro-campos 78df8dcb95 prevent user creation with leading or trailing spaces in user id 2020-01-10 13:50:04 +01:00
alejandro-campos ec6a763aa2 add check to prevent user creation with an id with trailing spaces 2020-01-10 13:24:00 +01:00
Jose Gonzalez 4670ed922a Added control for correct UTF8 encoding 2020-01-09 17:25:24 +01:00
Tatiana Llorente 665e9e4c98 Show gis icon only if enabled gis 2020-01-08 15:57:18 +01:00
Tatiana Llorente f61ba42dd7 Resolve conflicts 2020-01-08 15:48:07 +01:00
Tatiana Llorente 7701ff7ad1 Resolve conflicts 2020-01-08 15:44:59 +01:00
Tatiana Llorente eb222cc82f Merge remote-tracking branch 'origin/develop' into ent-4788-Icono-GIS-en-Setup-desaparecido 
Conflicts:
	pandora_console/godmode/setup/setup.php
 2020-01-08 15:41:45 +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
Alejandro Campos 0468c85a4d Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024' 
# Conflicts:
#   pandora_console/godmode/setup/setup_visuals.php
 2020-01-07 12:00:27 +01:00
Daniel Rodriguez eea9b0337c Merge branch 'ent-5081-Fallo-estético-en-el-Update-manager-Offline' into 'develop' 
Ent 5081 fallo estético en el update manager offline

See merge request artica/pandorafms!2977
 2020-01-07 11:12:59 +01:00
alejandro-campos 7c952eaaa8 changes visual setup 2020-01-07 10:56:37 +01:00
vgilc 5f3889b5f6 Merge branch 'ent-4573-Cambio-en-el-switch-de-deshabilitar-agentes' into 'develop' 
Change label for disabled status - #4573

See merge request artica/pandorafms!2693
 2020-01-07 10:48:11 +01:00