Commit Graph

1165 Commits

Author SHA1 Message Date
Jose Gonzalez 0363a90e1f Resolve merge issues 2023-01-31 17:35:44 +01:00
Diego Muñoz-Reja 0aa16baf33 Merge branch 'ent-10171-14838-tokens-snmp-de-interfaz-en-performance-no-se-activan-por-defecto-en-snmp-interfaces' into 'develop'
Ent 10171 14838 tokens snmp de interfaz en performance no se activan por defecto en snmp interfaces

See merge request artica/pandorafms!5437
2023-01-31 14:48:25 +00:00
Daniel Cebrian 1f13daf2be #10233 added padding in form main wizard 2023-01-31 12:53:04 +01:00
Jose Gonzalez 6496c08f28 Polish TreeView 2023-01-30 13:39:27 +01:00
Daniel Cebrian e8a355870e #10233 fixed filter styles in snmp interfaces wizard 2023-01-26 15:46:02 +01:00
Jose Gonzalez 17c0e78d06 Improve TreeView 2023-01-26 13:25:24 +01:00
Jonathan 83216bc4bf #8148 conflict solution 2023-01-24 16:15:22 +01:00
Diego Muñoz-Reja c462f389a4 Merge branch 'ent-10014-filtros-personalizados-para-logviewer' into 'develop'
Ent 10014 filtros personalizados para logviewer

See merge request artica/pandorafms!5414
2023-01-23 13:27:11 +00:00
Daniel Cebrian 290fb23cc5 #10171 fixed SNMP Interface Wizard defaults in performance when create snmp interface wizard 2023-01-20 09:31:02 +01:00
Daniel Cebrian 2816eeb003 #10009 added Recon script in create custom netscan 2023-01-19 13:46:46 +01:00
Jose Gonzalez 8510629781 Treeview improvement 2023-01-19 00:31:11 +01:00
Daniel Maya d56460c8de #10154 Fixed get_discovery_agents 2023-01-16 13:00:10 +01:00
Jonathan f3cd19c315 #10014 New filters log viewer 2023-01-16 11:34:28 +01:00
Jose Gonzalez a9c4dd625c Merge develop branch 2023-01-11 13:46:15 +01:00
Jonathan ceead626ee #8148 viewer log tables changes styles 2023-01-11 09:25:45 +01:00
Daniel Maya 0832d9613a #10052 Fixed fictional color 2023-01-10 16:40:53 +01:00
Jose Gonzalez 8421fb49ca Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones 2023-01-04 15:54:16 +01:00
Jonathan bc6893b83e #9362 Change sql for count modules from tagente_datos 2023-01-04 11:36:26 +01:00
Jonathan 6f2b50af56 #9362 Change getInforTAgenteDatos count alert 2023-01-04 11:16:51 +01:00
Rafael Ameijeiras b9d33a6315 Merge branch 'ent-10044-bugs-vista-snmp-traps' into 'develop'
Ent 10044 bugs vista snmp traps

See merge request artica/pandorafms!5353
2022-12-28 09:58:38 +00:00
Jonathan b666a3c308 #10044 Fix limit on rows showing on monitoring snmp console traps 2022-12-22 16:32:17 +01:00
daniel 47c503bdab Merge remote-tracking branch 'origin/develop' into ent-9554-nuevas-graficas-de-tarta-que-reemplazar-a-las-actuales-3 2022-12-21 12:51:18 +01:00
Daniel Barbero 3e071a7d33 remove phamtomjs pandora_enterprise#9554 2022-12-20 12:23:18 +01:00
Daniel Rodriguez 0f4e3d4056 Merge branch 'ent-9292-13830-vista-traps-snmp-peta-con-muchos-elementos' into 'develop'
Ent 9292 13830 vista traps snmp peta con muchos elementos

See merge request artica/pandorafms!5255
2022-12-20 10:20:26 +00:00
Daniel Maya 23407892b9 #9292 fixed issues 3 2022-12-20 10:03:45 +01:00
Jose Gonzalez b0997850f4 Fix server type icon definition 2022-12-19 16:38:47 +01:00
Daniel Maya 091dda3eea #9292 fixed issues 2 2022-12-19 16:30:41 +01:00
Daniel Maya aa34653049 #9292 fixed issues 2022-12-19 11:51:43 +01:00
alejandro.campos@artica.es 4ca220a3a7 Merge remote-tracking branch 'origin/develop' into ent-9323-14021-Modificar-el-display-de-valores-de-informe 2022-12-15 15:28:58 +01:00
Diego Muñoz-Reja 31919d4d2c Merge branch 'ent-9801-bloqueo-de-boton-en-generacion-de-ficheros-pdf-csv-json-varias-secciones' into 'develop'
Prepare download control

See merge request artica/pandorafms!5276
2022-12-12 08:29:51 +00:00
jose.gonzalez@pandorafms.com 445a8161cf Merge 2022-12-05 09:44:35 +01:00
Calvo 718be360d5 Download wait message 2022-12-02 15:40:47 +01:00
Calvo d525cb594c WIP: Download wait message 2022-12-02 09:42:24 +01:00
jose.gonzalez@pandorafms.com dccd950e9e Changes 2022-11-30 10:14:42 +01:00
Daniel Maya c0e5706d85 #9880 Fixed network usage map 2022-11-29 15:41:10 +01:00
jose.gonzalez@pandorafms.com a688182062 Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones 2022-11-22 17:47:02 +01:00
jose.gonzalez@pandorafms.com 8e0e249b81 Fixed views and styles 2022-11-21 14:49:07 +01:00
Calvo 43fd43d0d5 Updated php versopm notifications to php8 2022-11-15 10:29:15 +01:00
Daniel Maya 564cd837ae #9292 code refactoring 2022-11-14 17:43:35 +01:00
Rafael Ameijeiras 43690d3aa6 Merge branch 'ent-9745-XSS' into 'develop'
fixed vulnerability in load of help iframes

See merge request artica/pandorafms!5245
2022-11-08 11:49:46 +00:00
Jimmy Olano a548d2a798 Merge branch 'ent-9722-cartel-de-licencia-expirada' into 'develop'
Ent 9722 cartel de licencia expirada

#9722

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9722

See merge request artica/pandorafms!5237
2022-11-04 10:07:56 +00:00
edu.corral fb4b42e6c5 ent 9722 expired license notifications 2022-11-03 13:55:06 +01:00
alejandro.campos@artica.es 2c7d7e4044 fixed vulnerability in load of help iframes 2022-11-03 13:53:10 +01:00
Daniel Rodriguez e52da7d379 Merge branch 'ent-9105-poder-anadir-colecciones-al-satellite-server' into 'develop'
Ent 9105 poder anadir colecciones al satellite server

See merge request artica/pandorafms!5202
2022-11-03 10:28:32 +00:00
jose.gonzalez@pandorafms.com 32466c6906 Changes 2022-11-03 10:18:17 +01:00
edu.corral 8d34ef88c5 ent 9722 expired licence notification 2022-11-02 09:19:15 +01:00
jose.gonzalez@pandorafms.com 195611a3c1 Adapt views and refactor 2022-10-28 15:01:00 +02:00
Daniel Maya 382e74ae36 resolved conflict 2022-10-27 09:42:40 +02:00
alejandro.campos@artica.es 8d611a8e7f implemented float formatting and option in reports to change visualization format 2022-10-26 18:25:16 +02:00
jose.gonzalez@pandorafms.com edbf7ff249 Adapted views 2022-10-26 17:04:50 +02:00