Commit Graph

4651 Commits

Author SHA1 Message Date
Jose Gonzalez 735cec1441 WIP: Agent status 2022-12-23 10:21:53 +01:00
Jose Gonzalez ffa4ec756c Agent Group icons adding 2022-12-20 17:22:35 +01:00
Jose Gonzalez b0997850f4 Fix server type icon definition 2022-12-19 16:38:47 +01:00
jose.gonzalez@pandorafms.com 4fd0115d80 Adapt views 2022-12-15 12:42:35 +01:00
jose.gonzalez@pandorafms.com 445a8161cf Merge 2022-12-05 09:44:35 +01:00
jose.gonzalez@pandorafms.com dccd950e9e Changes 2022-11-30 10:14:42 +01:00
alejandro.campos@artica.es d170771905 fixed filter 2022-11-24 16:18:58 +01:00
jose.gonzalez@pandorafms.com 251fddacd0 From merge 2022-11-23 13:26:54 +01:00
Daniel Rodriguez 8e860d153b Merge branch 'ent-9874-editar-usuario-propio-admin-en-meta-da-un-error-500' into 'develop'
Ent 9874 editar usuario propio admin en meta da un error 500

See merge request artica/pandorafms!5286
2022-11-23 11:12:16 +00:00
Daniel Rodriguez 0fb90e3383 Merge branch 'ent-9861-stored-cross-site-scripting-vulnerability-in-create-event-section' into 'develop'
Fix events view XSS vulnerabilities

See merge request artica/pandorafms!5284
2022-11-23 09:46:52 +00:00
José González 001892ed5a Fix issue with empty autorefresh list 2022-11-23 09:42:12 +00: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
Calvo 5aa51f28de Fix events view XSS vulnerabilities 2022-11-22 15:54:19 +01:00
Daniel Barbero d1beb5cb2d fixed filters pandora_enterprise#9864 2022-11-22 11:35:38 +01:00
Daniel Rodriguez 34c3f7a326 Merge branch 'ent-9487-GISS-Conteo-incorrecto-sobre-número-de-agentes-en-búsqueda-general' into 'develop'
fix count

See merge request artica/pandorafms!5194
2022-11-22 09:18:42 +00:00
Jimmy Olano eaae19ab41 Merge branch 'ent-9683-bug-en-leyenda-de-graficas-snmp' into 'develop'
fix interfaces charts pandora_enterprise#9683

pandora_enterprise#9683

See merge request artica/pandorafms!5278
2022-11-22 00:32:10 +00:00
jose.gonzalez@pandorafms.com 7dce208df9 Update breadcrumbs for Agents and other minor fixes 2022-11-21 23:45:07 +01:00
jose.gonzalez@pandorafms.com 8e0e249b81 Fixed views and styles 2022-11-21 14:49:07 +01:00
jose.gonzalez@pandorafms.com 03157caefe Redo agent edition-creation view 2022-11-15 16:02:40 +01:00
jose.gonzalez@pandorafms.com f99a7dc511 Adaptations 2022-11-07 14:04:07 +01:00
jose.gonzalez@pandorafms.com 92dd21701f View changes 2022-11-04 13:00:00 +01:00
edu.corral 341fe37def ent 7914 status scaling based on time 2022-11-04 12:13:38 +01:00
Daniel Rodriguez 8097001b19 Merge branch 'ent-9233-Historico-de-traps-2' into 'develop'
show historical traps in snmp console

See merge request artica/pandorafms!5235
2022-11-03 14:14:26 +00:00
Jimmy Olano 6a36fd305b Merge branch 'ent-9731-vista-de-alertas-en-agente-aplica-filtro-de-grupo-por-defecto' into 'develop'
Ent 9731 vista de alertas en agente aplica filtro de grupo por defecto

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

See merge request artica/pandorafms!5238
2022-11-02 14:58:39 +00:00
alejandro.campos@artica.es d7808f6dc3 re-sort traps if history enabled 2022-11-02 14:27:08 +01:00
alejandro.campos@artica.es 930da6c58f re-sort traps if history enabled 2022-11-02 14:25:48 +01:00
Jimmy Olano 271551c3e6 Merge branch 'ent-9717-vulnerabilidad-xss' into 'develop'
Fix XSS vulnerability

ref:pandora_enterprise#9717

See merge request artica/pandorafms!5230
2022-11-02 13:04:28 +00:00
Daniel Maya d44760fd08 #9731 Fixed idAgent 2022-11-02 09:41:07 +01:00
alejandro.campos@artica.es 8ad0bbf892 show historical traps in snmp console 2022-10-31 15:59:24 +01:00
Daniel Rodriguez 41946bfda7 Merge branch 'ent-4822-estado-de-consola-visual-mantenimiento' into 'develop'
add mode maintenance VC pandora_enterprise#4822

See merge request artica/pandorafms!5191
2022-10-31 10:02:44 +00:00
jose.gonzalez@pandorafms.com 195611a3c1 Adapt views and refactor 2022-10-28 15:01:00 +02:00
Calvo ccc27883f6 Fix XSS vulnerability 2022-10-28 10:52:52 +02:00
Daniel Barbero 6d19391c72 fix interfaces charts pandora_enterprise#9683 2022-10-27 16:12:17 +02:00
Alejandro Campos a58bc3bf08 Merge branch 'develop' into 'ent-9430-2FA-Authentication-sigue-saltando-tras-deshabilitar-en-consola'
# Conflicts:
#   pandora_console/general/register.php
2022-10-27 09:47:49 +00:00
jose.gonzalez@pandorafms.com 2cb72f532c Adapted views 2022-10-26 17:00:54 +02:00
jose.gonzalez@pandorafms.com 5e4bf4863c Adapted views 2022-10-26 12:02:56 +02:00
Daniel Barbero 3273fc23ed Merge remote-tracking branch 'origin/develop' into ent-4822-estado-de-consola-visual-mantenimiento
Conflicts:
	pandora_console/extras/mr/58.sql
2022-10-26 09:42:02 +02:00
jose.gonzalez@pandorafms.com 5aaa415ed9 Several fixes 2022-10-25 17:11:18 +02:00
jose.gonzalez@pandorafms.com 13b0c7d0c8 Fixed views 2022-10-25 13:13:52 +02:00
jose.gonzalez@pandorafms.com 70d0e38382 Adapt views 2022-10-25 11:46:28 +02:00
Daniel Rodriguez 8aa6ea8bc8 Merge branch 'ent-8725-lista-exclusion-passwords' into 'develop'
Added exclude words for passwords control

See merge request artica/pandorafms!5174
2022-10-25 09:07:08 +00:00
Daniel Rodriguez b6a38e1b7a Merge branch 'ent-9671-faltan-opciones-masivas-en-operaciones-con-eventos' into 'develop'
event multiple operations pandora_enterprise#9671

See merge request artica/pandorafms!5203
2022-10-25 09:05:43 +00:00
jose.gonzalez@pandorafms.com 00de0faac3 Adapted views 2022-10-24 19:55:22 +02:00
Diego Muñoz-Reja aff8fdb005 Merge branch 'ent-9425-agrupar-eventos-por-id_extra' into 'develop'
new group by events for extraid pandora_enterprise#9425

See merge request artica/pandorafms!5147
2022-10-24 15:19:21 +00:00
jose.gonzalez@pandorafms.com 4cf92cc995 Adapted views 2022-10-24 13:13:56 +02:00
jose.gonzalez@pandorafms.com 83de025bc9 Several adaptations 2022-10-21 13:47:41 +02:00
Diego Muñoz-Reja 423d4b8763 Merge branch 'ent-9641-mejorar-heatmaps' into 'develop'
Ent 9641 mejorar heatmaps

See merge request artica/pandorafms!5196
2022-10-21 09:29:40 +00:00
José González 984fd10897 Merge branch 'develop' into 'ent-8725-lista-exclusion-passwords'
# Conflicts:
#   pandora_console/include/auth/mysql.php
2022-10-21 06:44:47 +00:00
Daniel Barbero 6ef3505eab event multiple operations pandora_enterprise#9671 2022-10-19 16:20:49 +02:00
Diego Muñoz-Reja c8e8ea61f3 Merge branch 'ent-2133-14061-recursividad-en-la-vista-de-eventos-accelya' into 'develop'
filter recursive groups in events pandora_enterprise#2133

See merge request artica/pandorafms!5155
2022-10-19 11:46:38 +00:00