Commit Graph

32291 Commits

Author SHA1 Message Date
Jose Gonzalez e99ad97e17 Fixes and improvements 2023-02-07 15:33:29 +01:00
Jose Gonzalez 0eaa52a042 Added funcion for set placeholders 2023-02-07 13:20:23 +01:00
Jose Gonzalez 8f78f89aa3 Improve views and forms 2023-02-07 13:19:40 +01:00
Jose Gonzalez dfdcb688d4 Improve code 2023-02-06 23:10:28 +01:00
Jose Gonzalez ac144de6d6 WIP: Minor fixes 2023-02-06 10:17:51 +01:00
Jose Gonzalez a9df7e2ec5 WIP: Improve somethings 2023-02-03 16:36:04 +01:00
Jose Gonzalez e3b2ec529a Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones 2023-02-03 14:16:47 +01:00
Jose Gonzalez 0a61f6dcc7 WIP: User management View and BL 2023-02-03 14:10:26 +01:00
Jose Gonzalez b9992c5a67 Minor fixes for solve visual issues 2023-02-03 12:37:09 +01:00
Rafael Ameijeiras 30a0e2abe8 Merge branch 'ent-10076-anadir-un-acceso-mas-directo-a-attachments-plugins' into 'develop'
Ent 10076 anadir un acceso mas directo a attachments plugins

See merge request artica/pandorafms!5441
2023-02-03 09:36:53 +00:00
artica 36b0fc9028 Auto-updated build strings. 2023-02-03 01:01:54 +01:00
Daniel Rodriguez 67a4e2b04b Merge branch 'ent-9600-Estado-erroneo-de-servidor-cuando-hay-un-TZ-distinto-entre-servidor-consola' into 'develop'
fix server status when distinct timezones

See merge request artica/pandorafms!5439
2023-02-02 16:07:02 +00:00
Daniel Rodriguez f28a4d0f28 Merge branch 'ent-10162-stored-cross-site-scripting-special-days-module' into 'develop'
Ent 10162 stored cross site scripting special days module

See merge request artica/pandorafms!5444
2023-02-02 14:29:14 +00:00
Rafael Ameijeiras 3bc593e58a Merge branch 'ent-10219-stored-cross-site-scripting-in-syslog-section' into 'develop'
Ent 10219 stored cross site scripting in syslog section

See merge request artica/pandorafms!5464
2023-02-02 10:02:32 +00:00
Rafael Ameijeiras ccb93c0918 Merge branch 'ent-10163-Remote-Code-Execution-via-Unrestricted-File-Upload' into 'develop'
fixed vulnerability

See merge request artica/pandorafms!5476
2023-02-02 10:02:15 +00:00
Matias Didier 9a7c9488eb Merge branch 'ent-10277-vista-about-tarda-mucho' into 'develop'
Ent 10277 vista about tarda mucho

See merge request artica/pandorafms!5493
2023-02-02 08:46:17 +00:00
artica b674569613 Auto-updated build strings. 2023-02-02 01:01:52 +01:00
Daniel Cebrian 427ab4d058 #10277 remove db size in about popup 2023-02-01 17:51:31 +01:00
Diego Muñoz-Reja 997a8d5434 Merge branch 'ent-10159-Server-side-request-forgery-in-api-checker' into 'develop'
fixed ssrf vulnerability

See merge request artica/pandorafms!5489
2023-02-01 15:45:29 +00:00
Matias Didier da83dee4d9 Merge branch 'ent-10290-Eventos-validados-muestran-ACK-incorrectamente' into 'develop'
fixed minor bug

See merge request artica/pandorafms!5491
2023-02-01 15:09:16 +00:00
Jose Gonzalez bd26aa8f8d Minor fixes 2023-02-01 15:31:02 +01:00
Diego Muñoz-Reja acb7416148 Merge branch 'ent-10236-14934-module-bulk-operations-anade-dynamic-interval-a-los-modulos-a-pesar-de-estar-en-none' into 'develop'
Ent 10236 14934 module bulk operations anade dynamic interval a los modulos a pesar de estar en none

See merge request artica/pandorafms!5471
2023-02-01 14:17:15 +00:00
Jose Gonzalez 2c8c1d4593 Minor fixes and improvements 2023-02-01 15:14:32 +01:00
alejandro.campos@artica.es 4d24f281fe fixed minor bug 2023-02-01 14:56:30 +01:00
alejandro.campos@artica.es 022ca1c6a4 fixed ssrf vulnerability 2023-02-01 13:12:12 +01:00
Jimmy Olano c4659f0c58 Merge branch 'ent-10126-no-permite-editar-etiqueta-en-elemento-de-consola-visual' into 'develop'
Ent 10126 no permite editar etiqueta en elemento de consola visual

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

See merge request artica/pandorafms!5407
2023-02-01 10:56:25 +00:00
alejandro.campos@artica.es a69f3eb0dc minor change 2023-02-01 10:24:35 +01:00
Matias Didier 6d2f4d7eac Merge branch 'ent-10208-sound-events-antiguo-aun-se-puede-usar-en-nodo' into 'develop'
remove old format events sounds pandora_enterprise#10208

See merge request artica/pandorafms!5468
2023-02-01 07:18:29 +00:00
Matias Didier 08ca68a663 Merge branch 'ent-10274-Overview-de-alertas-no-muestra-correctamente-las-alertas' into 'develop'
fixed filter

See merge request artica/pandorafms!5480
2023-02-01 07:05:49 +00:00
artica 3579cc22c1 Auto-updated build strings. 2023-02-01 01:02:36 +01:00
Jimmy Olano c15fe41897 Merge branch 'ent-9473-derivado-del-trabajo-q-a-765-api-pfms-get-total_modules-no-devuelve-total-por-grupo-especifico' into 'develop'
Ent 9473 derivado del trabajo q a 765 api pfms get total modules no devuelve total por grupo especifico

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

See merge request artica/pandorafms!5419
2023-01-31 19:15:34 +00:00
Jose Gonzalez 0363a90e1f Resolve merge issues 2023-01-31 17:35:44 +01:00
Daniel Rodriguez a96f3afdc2 Merge branch 'ent-10032-contrasena-de-replicacion-de-bbdd-no-se-encripta-en-bbdd' into 'develop'
Ent 10032 contrasena de replicacion de bbdd no se encripta en bbdd

See merge request artica/pandorafms!5418
2023-01-31 16:25:59 +00:00
Matias Didier c7f4388768 Merge branch 'ent-10212-14875-enterprise-acl-con-permisos-de-edicion-no-puede-editar-custom-reports' into 'develop'
Ent 10212 14875 enterprise acl con permisos de edicion no puede editar custom reports

See merge request artica/pandorafms!5475
2023-01-31 15:28:15 +00:00
Daniel Cebrian dcb69c2cf4 Merge branch 'develop' into 'ent-10236-14934-module-bulk-operations-anade-dynamic-interval-a-los-modulos-a-pesar-de-estar-en-none'
# Conflicts:
#   pandora_console/godmode/massive/massive_edit_modules.php
2023-01-31 15:10:26 +00: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
Rafael Ameijeiras 957097f34b Merge branch 'ent-10223-eliminar-descripcion-por-defecto-al-crear-agentes-desde-data-server' into 'develop'
Ent 10223 eliminar descripcion por defecto al crear agentes desde data server

See merge request artica/pandorafms!5481
2023-01-31 14:02:56 +00:00
Daniel Rodriguez e54833a54b Merge branch 'ent-10166-anadir-indices-al-modelo-de-datos' into 'develop'
Ent 10166 anadir indices al modelo de datos

See merge request artica/pandorafms!5450
2023-01-31 13:51:50 +00:00
Diego Muñoz-Reja 46079855f7 Merge branch 'ent-10233-descuadre-en-snmp-interface-wizard' into 'develop'
Ent 10233 descuadre en snmp interface wizard

See merge request artica/pandorafms!5463
2023-01-31 12:17:25 +00:00
Jose Gonzalez fbdd91e4ff Improve user profile list view 2023-01-31 12:59:49 +01:00
Daniel Cebrian 1f13daf2be #10233 added padding in form main wizard 2023-01-31 12:53:04 +01:00
Ramon Novoa 3997ab3d2e Fix pandora_dbstress.pl.
pandora_dbstress.pl was broken because an invalid parameter was being
passed to pandora_process_module.
2023-01-31 12:29:53 +01:00
Daniel Cebrian bbb249d031 #10126 clear log 2023-01-31 12:13:57 +01:00
Diego Muñoz-Reja ea8b5d68d7 Merge branch 'ent-9270-dos-mejoras-en-el-interface-view' into 'develop'
Ent 9270 dos mejoras en el interface view

See merge request artica/pandorafms!5428
2023-01-31 11:10:19 +00:00
alejandro.campos@artica.es 7d7ee65c7b fixed filter 2023-01-31 11:51:00 +01:00
Matias Didier 7067259e97 Merge branch 'ent-10153-el-modo-mantenimiento-en-url-anonima-compartida-no-funciona' into 'develop'
Ent 10153 el modo mantenimiento en url anonima compartida no funciona

See merge request artica/pandorafms!5416
2023-01-31 10:50:45 +00:00
Calvo 1a122da321 Removed dataserver agent default description 2023-01-31 11:42:21 +01:00
Calvo 132ea6922c Removed dataserver agent default description 2023-01-31 11:41:27 +01:00
Jonathan f0d20a5775 #10153 indexof pandora visual console 2023-01-31 10:47:31 +01:00
Jonathan 45b67b1f7a #9270 Icon for InOctets and OutOctets graph 2023-01-31 09:32:06 +01:00