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

7693 Commits

Author SHA1 Message Date
Jonathan 351a274639 #11297 fix inverse interval for remote SNMP module 2023-05-30 09:50:40 +02:00
Matias Didier b4d1054b4f Merge branch 'ent-11289-editar-agente-url-se-mete-una-cadena-de-texto-sola' into 'develop' 
Ent 11289 editar agente url se mete una cadena de texto sola

See merge request artica/pandorafms!5926
 2023-05-29 10:41:35 +00:00
Diego Muñoz-Reja e285b923f6 Merge branch 'ent-11299-advanced-options-de-configuracion-de-agente-no-aparece-en-community' into 'develop' 
Ent 11299 advanced options de configuracion de agente no aparece en community

See merge request artica/pandorafms!5928
 2023-05-29 09:15:57 +00:00
Daniel Cebrian 206daabbd7 #11379 fixed filter in agent list when use action 2023-05-29 10:59:12 +02:00
Jonathan a59a6ff750 #11297 fix interval reverse on critical/warning 2023-05-29 10:01:15 +02:00
miguel angel rasteu c21e26ee1f #11370 Fix default value selected 2023-05-26 13:54:11 +02:00
Daniel Cebrian 0e64721ca5 #11374 fixed bulk operation user 2023-05-26 12:37:37 +02:00
Daniel Rodriguez 5b03d95967 Merge branch 'ent-10865-15337-15360-Macros-Custom-Fields-no-funcionan-en-modulos-SNMP' into 'develop' 
add target ip field to remote components

See merge request artica/pandorafms!5799
 2023-05-25 15:11:47 +00:00
Rafael Ameijeiras a43b013fb4 Merge branch 'ent-11300-perdida-de-node-access-al-actualizar-los-datos-de-usuario-propio-no-admin' into 'develop' 
Ent 11300 perdida de node access al actualizar los datos de usuario propio no admin

See merge request artica/pandorafms!5934
 2023-05-25 15:00:34 +00:00
Rafael Ameijeiras cc54c69339 Merge branch 'ent-11304-ventana-modal-en-la-creacion-de-modulos-es-muy-pequena' into 'develop' 
Ent 11304 ventana modal en la creacion de modulos es muy pequena

See merge request artica/pandorafms!5946
 2023-05-25 14:54:16 +00:00
Rafael Ameijeiras d231593148 Merge branch 'ent-11215-al-ajustar-el-periodo-de-un-modulo-nuevo-creado-a-mano-el-intervalo-de-5min-no-se-puede' into 'develop' 
Ent 11215 al ajustar el periodo de un modulo nuevo creado a mano el intervalo de 5min no se puede

See merge request artica/pandorafms!5898
 2023-05-25 14:50:54 +00:00
Matias Didier c53e14ee37 Merge branch 'ent-11285-edicion-item-server-en-cualquier-informe-sql-de-metaconsola-no-funciona' into 'develop' 
Ent 11285 edicion item server en cualquier informe sql de metaconsola no funciona

See merge request artica/pandorafms!5938
 2023-05-25 12:53:28 +00:00
Jorge Rincon 662329793a fixed bug for different types of SQL reports 2023-05-25 14:25:18 +02:00
Matias Didier 04f802aa40 Merge branch 'ent-11318-item-informe-inventory-inventory-en-metaconsola-no-funciona' into 'develop' 
Ent 11318 item informe inventory inventory en metaconsola no funciona

See merge request artica/pandorafms!5935
 2023-05-25 09:32:32 +00:00
Rafael Ameijeiras 16336a5cde Merge branch 'ent-11242-error-500-al-intentar-editar-un-usuario-en-metaconsola-tyr' into 'develop' 
Ent 11242 error 500 al intentar editar un usuario en metaconsola tyr

See merge request artica/pandorafms!5933
 2023-05-24 15:41:56 +00:00
Diego Muñoz-Reja 5ac364664a Merge branch 'ent-11321-si-actualizas-un-item-de-informe-ejemplo-histogram-graph-se-pierde-barra-superior' into 'develop' 
Ent 11321 si actualizas un item de informe ejemplo histogram graph se pierde barra superior

See merge request artica/pandorafms!5940
 2023-05-24 14:47:10 +00:00
Matias Didier a076593c94 Merge branch 'ent-9242-falta-traduccion-registro-de-plugins-en-la-consola' into 'develop' 
Ent 9242 falta traduccion registro de plugins en la consola

See merge request artica/pandorafms!5914
 2023-05-24 14:11:59 +00:00
miguel angel rasteu e2cea8d78e #11331 Add GCP constant 2023-05-24 13:37:14 +02:00
Alejandro Campos 988db793da Merge branch 'develop' into 'ent-10865-15337-15360-Macros-Custom-Fields-no-funcionan-en-modulos-SNMP' 
# Conflicts:
#   pandora_console/extras/mr/64.sql
 2023-05-24 09:20:14 +00:00
Jonathan 99b274d362 #10598 new wizard welcome 2023-05-24 08:41:46 +02:00
Daniel Cebrian 25d1b2a5cd #11318 added funcion for validate sql when create item 2023-05-23 18:05:14 +02:00
Daniel Cebrian 6b17837c4d #11318 added funcion for validate sql 2023-05-23 18:02:03 +02:00
Jonathan 9829d9281c #10598 new wizard welcome 2023-05-23 17:00:00 +02:00
Jonathan ae526d5df0 #10598 New wizard welcome 2023-05-23 16:54:40 +02:00
miguel angel rasteu 8bd1378d45 #11293 Fix the menu to point to the list of reports and the link on all icons 2023-05-23 16:35:55 +02:00
Jorge Rincon b9400e73b4 #11304 adjusted the size of the modal create module and the width of the select 2023-05-23 12:48:01 +02:00
Daniel Rodriguez dbf7d4dcfe Merge branch 'ent-11054-15466-modo-legacy-con-problemas' into 'develop' 
fixed visual errors in legacy VC pandora_enterprise#11054

See merge request artica/pandorafms!5829
 2023-05-23 10:07:14 +00:00
Daniel Cebrian e56f15bacf #11321 fixed header in metaconsole when update item 2023-05-23 10:07:23 +02:00
Jorge Rincon 169f19bc42 #11285 fixed select server creation 2023-05-23 09:19:08 +02:00
Daniel Cebrian 303b910527 #11318 fixed error 500 2023-05-22 19:33:25 +02:00
Daniel Cebrian cfa61f0726 #11322 fixed type 2023-05-22 18:14:48 +02:00
Daniel Cebrian 55794b640a #11322 change throw_unknown_events token in remote components 2023-05-22 18:12:14 +02:00
Rafael Ameijeiras 8aae692cb2 Merge branch 'ent-11117-edicion-usuario-entorno-meta-nodo' into 'develop' 
Ent 11117 edicion usuario entorno meta nodo

See merge request artica/pandorafms!5856
 2023-05-22 16:12:04 +00:00
Rafael Ameijeiras 7089b12256 Merge branch 'ent-10994-icono-borroso-en-edicion-de-custom-graph' into 'develop' 
Ent 10994 icono borroso en edicion de custom graph

See merge request artica/pandorafms!5740
 2023-05-22 16:00:55 +00:00
Daniel Cebrian 0f9384326e #11300 fixed access metaconsole when user not admin update her config 2023-05-22 17:12:35 +02:00
Daniel Cebrian 761feed0dd #11300 fixed node access token in users not admin, meta 2023-05-22 15:01:04 +02:00
Matias Didier 47430f926e Merge branch 'ent-11140-algunos-wizards-siguen-sin-tener-los-estilos-aplicados' into 'develop' 
Ent 11140 algunos wizards siguen sin tener los estilos aplicados

See merge request artica/pandorafms!5883
 2023-05-22 11:38:53 +00:00
miguel angel rasteu 404c606243 #10994 Add graph container svg 2023-05-22 13:22:05 +02:00
miguel angel rasteu 5207585d2b #10994 Fix builder svg 2023-05-22 12:50:29 +02:00
Diego Muñoz-Reja 1920a8d599 Merge branch 'ent-10924-entradas-confusas-en-audit-log-al-habilitar-deshabilitar-modulos' into 'develop' 
Ent 10924 entradas confusas en audit log al habilitar deshabilitar modulos

See merge request artica/pandorafms!5725
 2023-05-22 10:19:28 +00:00
miguel angel rasteu 33d95ef00e #11117 Add new field in tusuario for metaconsole event default and fix selectors 2023-05-22 12:08:27 +02:00
Jorge Rincon 0def9b252e #11242 validate autorefresh_list field that allows to load the view, edit user 2023-05-22 11:54:43 +02:00
Jonathan 5fe0f7fb08 #11140 fix style message warning 2023-05-22 11:39:59 +02:00
Daniel Cebrian efc96d9661 #11299 added avanced mode agent in open version 2023-05-22 10:01:57 +02:00
Daniel Cebrian 94cdd624fa #11289 fixed autocomplete url address in agent 2023-05-19 13:10:19 +02:00
Miguel Angel Rasteu 5470e4d749 Merge branch 'develop' into 'ent-11117-edicion-usuario-entorno-meta-nodo' 
# Conflicts:
#   pandora_console/extras/mr/64.sql
#   pandora_console/godmode/users/user_management.php
 2023-05-19 10:25:31 +00:00
Daniel Cebrian c204558a57 #11288 fixed icon gis in agent 2023-05-19 11:00:39 +02:00
miguel angel rasteu efc2990a5c #11117 Fix homscreen in metaconsole 2023-05-19 10:49:16 +02:00
Matias Didier 2db1eddc11 Merge branch 'ent-10326-bearer-token-permite-conectar-con-pandora1234-por-defecto' into 'develop' 
Ent 10326 bearer token permite conectar con pandora1234 por defecto

See merge request artica/pandorafms!5782
 2023-05-19 07:00:38 +00:00
Diego Muñoz-Reja 3e3faaf922 Merge branch 'ent-11087-15509-no-se-puede-editar-elementos-en-paradas-planificadas-el-boton-no-funciona' into 'develop' 
Ent 11087 15509 no se puede editar elementos en paradas planificadas el boton no funciona

See merge request artica/pandorafms!5849
 2023-05-18 11:57:57 +00:00
Daniel Rodriguez 00983dfe16 Merge branch 'ent-11176-no-funciona-debug-de-modulos-web' into 'develop' 
Ent 11176 no funciona debug de modulos web

See merge request artica/pandorafms!5888
 2023-05-18 11:19:34 +00:00
Diego Muñoz-Reja 4a8e8f4ae1 Merge branch 'ent-11103-15535-agente-debe-de-ser-aplicado-cuando-ya-esta-aplicado' into 'develop' 
fixed modules adopted pandora_enterprise#11103

See merge request artica/pandorafms!5836
 2023-05-18 09:20:31 +00:00
Rafael Ameijeiras 0b65e9b721 Merge branch 'ent-11050-problema-macro-_alert_critical_instructions_-en-acciones-y-templates-de-alertas' into 'develop' 
Ent 11050 problema macro  alert critical instructions  en acciones y templates de alertas

See merge request artica/pandorafms!5828
 2023-05-17 14:48:50 +00:00
Rafael Ameijeiras 0bb69dda4d Merge branch 'ent-10328-14815-campos-ocultos-no-se-ocultan-en-comandos-segun-el-navegador' into 'develop' 
Ent 10328 14815 campos ocultos no se ocultan en comandos segun el navegador

See merge request artica/pandorafms!5783
 2023-05-17 14:47:08 +00:00
Rafael Ameijeiras 1bf3b94100 Merge branch 'ent-11098-snmp-walk-desde-editor-de-modulos-no-te-permite-seleccionar-oid-para-crear-modulo' into 'develop' 
Ent 11098 snmp walk desde editor de modulos no te permite seleccionar oid para crear modulo

See merge request artica/pandorafms!5835
 2023-05-17 14:45:41 +00:00
Rafael Ameijeiras 5bd875d005 Merge branch 'ent-10998-15445-problemas-edicion-usuarios-con-acl-enterprise-en-la-nueva-ui' into 'develop' 
Ent 10998 15445 problemas edicion usuarios con acl enterprise en la nueva ui

See merge request artica/pandorafms!5775
 2023-05-17 14:45:00 +00:00
Rafael Ameijeiras b3f37f8bb4 Merge branch 'ent-10991-15445-usuario-estandar-con-perfil-pandora-administrator-no-puede-ver-vista-authentication' into 'develop' 
Ent 10991 15445 usuario estandar con perfil pandora administrator no puede ver vista authentication

See merge request artica/pandorafms!5751
 2023-05-17 14:42:27 +00:00
Rafael Ameijeiras e71d3a3f07 Merge branch 'ent-10623-se-anade-descripcion-automatica-al-configurar-puerto-en-chequeos-remotos' into 'develop' 
Ent 10623 se anade descripcion automatica al configurar puerto en chequeos remotos

See merge request artica/pandorafms!5786
 2023-05-17 14:41:50 +00:00
Matias Didier b2dfa48a34 Merge branch 'ent-11113-no-se-puede-configurar-umbral-warning-en-modulos-string-una-vez-creados' into 'develop' 
Ent 11113 no se puede configurar umbral warning en modulos string una vez creados

See merge request artica/pandorafms!5845
 2023-05-17 13:45:53 +00:00
Daniel Cebrian e29fef437b #11231 added token for filter recursively in remote component 2023-05-17 13:15:26 +02:00
Matias Didier 09030781bb Merge branch 'ent-11170-ya-no-pide-confirmacion-al-borrar-un-modulo' into 'develop' 
Ent 11170 ya no pide confirmacion al borrar un modulo

See merge request artica/pandorafms!5880
 2023-05-17 10:13:05 +00:00
Jorge Rincon eee080e623 #9242 fixed the text string so that it is taken into account in the translation 2023-05-17 11:19:57 +02:00
miguel angel rasteu cb63ee92f7 #10328 Fix JS code 2023-05-17 10:54:43 +02:00
Rafael Ameijeiras e478e2b9ba Merge branch 'ent-11241-15612-fallo-en-intervalo-inverso' into 'develop' 
Ent 11241 15612 fallo en intervalo inverso

See merge request artica/pandorafms!5909
 2023-05-17 08:06:34 +00:00
Rafael Ameijeiras d57e9c4f16 Merge branch 'ent-11094-modulo-tipo-plugin-usando-snmp_remote-no-muestra-opciones-de-configuracion-al-actualizar' into 'develop' 
Ent 11094 modulo tipo plugin usando snmp remote no muestra opciones de configuracion al actualizar

See merge request artica/pandorafms!5827
 2023-05-17 08:05:09 +00:00
Rafael Ameijeiras 04a3d89dcb Merge branch 'ent-11159-guardia-15520-problema-al-almacenar-contrasena-de-usuario-de-mas-de-45-caracteres' into 'develop' 
Ent 11159 guardia 15520 problema al almacenar contrasena de usuario de mas de 45 caracteres

See merge request artica/pandorafms!5871
 2023-05-17 08:04:23 +00:00
Rafael Ameijeiras 688454617f Merge branch 'ent-11217-fallo-al-deshabilitar-usuario-en-771' into 'develop' 
Ent 11217 fallo al deshabilitar usuario en 771

See merge request artica/pandorafms!5893
 2023-05-17 08:01:28 +00:00
Alejandro Campos 097dc8ef12 Merge branch 'develop' into 'ent-10865-15337-15360-Macros-Custom-Fields-no-funcionan-en-modulos-SNMP' 
# Conflicts:
#   pandora_console/extras/mr/64.sql
 2023-05-17 07:41:02 +00:00
Diego Muñoz-Reja 506ce4e24d Merge branch 'ent-11130-no-se-pueden-borrar-perfiles-de-usuarios' into 'develop' 
Ent 11130 no se pueden borrar perfiles de usuarios

See merge request artica/pandorafms!5847
 2023-05-16 16:02:08 +00:00
Daniel Cebrian d4c3df295c #11241 fixed inverse interval in module edit 2023-05-16 17:46:51 +02:00
miguel angel rasteu 52886b96b3 #10328 Fix security font and values 2023-05-16 17:03:10 +02:00
Pablo Aragon f4cf8e769a 11094-Fix plugin data recovery 2023-05-16 16:00:17 +02:00
Daniel Rodriguez 05a2aa07d5 Merge branch 'ent-11092-vista-tactica-de-grupo-es-demasiado-ancha' into 'develop' 
Draft: Ent 11092 vista tactica de grupo es demasiado ancha

See merge request artica/pandorafms!5817
 2023-05-16 10:12:57 +00:00
Daniel Rodriguez dbd0e435e1 Merge branch 'ent-11128-mejor-usabilidad-en-los-botones-de-test-de-conexion-con-integraciones' into 'develop' 
Ent 11128 mejor usabilidad en los botones de test de conexion con integraciones

See merge request artica/pandorafms!5848
 2023-05-16 10:12:11 +00:00
Daniel Rodriguez 9cf10e4f39 Merge branch 'ent-11147-mas-espacio-al-combo-de-creacion-de-modulos' into 'develop' 
Ent 11147 mas espacio al combo de creacion de modulos

See merge request artica/pandorafms!5865
 2023-05-16 09:58:39 +00:00
Daniel Rodriguez be807d572d Merge branch 'ent-10081-14644-meta-homescreen-no-aparece-en-edit-my-user-pero-si-en-configuracion-de-usuario' into 'develop' 
Ent 10081 14644 meta homescreen no aparece en edit my user pero si en configuracion de usuario

See merge request artica/pandorafms!5809
 2023-05-16 09:49:59 +00:00
Daniel Rodriguez e2ef02081a Merge branch 'ent-11179-15577-errores-en-varios-widgets-de-dashboard' into 'develop' 
Ent 11179 15577 errores en varios widgets de dashboard

See merge request artica/pandorafms!5884
 2023-05-16 09:43:38 +00:00
Daniel Rodriguez 64d25816d6 Merge branch 'ent-11158-15531-netflow-filters-al-dar-nombre-con-simbolos-espacio-al-filtro-crea-agentes-masivamente' into 'develop' 
Ent 11158 15531 netflow filters al dar nombre con simbolos espacio al filtro crea agentes masivamente

See merge request artica/pandorafms!5873
 2023-05-16 09:32:41 +00:00
miguel angel rasteu 4c102bee80 #11215 Fix selected option in interval select 2023-05-16 11:10:51 +02:00
Daniel Rodriguez 6b200c055c Merge branch 'ent-10666-vista-tactica-de-grupo-fe-de-errata-en-encabezado-de-columna' into 'develop' 
Ent 10666 vista tactica de grupo fe de errata en encabezado de columna

See merge request artica/pandorafms!5840
 2023-05-16 09:03:24 +00:00
Rafael Ameijeiras 6b8a3ab3d6 Merge branch 'ent-11167-15574-error-al-borrar-el-agente-el-borrado-es-correcto' into 'develop' 
Ent 11167 15574 error al borrar el agente el borrado es correcto

See merge request artica/pandorafms!5879
 2023-05-12 11:30:22 +00:00
miguel angel rasteu 0505d24828 #11217 Comment CSRF Validator 2023-05-12 12:48:53 +02:00
Rafael Ameijeiras ca1e1748a2 Merge branch 'ent-11068-ha-desaparecido-la-opcion-de-change-to-critical-status-after' into 'develop' 
Ent 11068 ha desaparecido la opcion de change to critical status after

See merge request artica/pandorafms!5807
 2023-05-12 09:31:05 +00:00
Rafael Ameijeiras eb0be5c2c7 Merge branch 'ent-11067-no-aparece-la-ip-al-hacer-hover-sobre-el-modulo' into 'develop' 
Ent 11067 no aparece la ip al hacer hover sobre el modulo

See merge request artica/pandorafms!5801
 2023-05-12 09:20:38 +00:00
Daniel Rodriguez ff99c7b881 Merge branch 'ent-11090-15510-error-en-vista-tactica-en-entorno-sin-etiquetas' into 'develop' 
Ent 11090 15510 error en vista tactica en entorno sin etiquetas

See merge request artica/pandorafms!5819
 2023-05-12 08:42:57 +00:00
miguel angel rasteu ec658476b2 #10081 Fix homescreen 2023-05-11 16:44:11 +02:00
Daniel Cebrian 5195c6acaf #11176 fixed dialog debug module 2023-05-11 15:39:58 +02:00
Matias Didier 6d0650b6c6 Merge branch 'ent-11058-cambiar-mensaje-de-bienvenida-por-defecto-para-la-lts' into 'develop' 
Ent 11058 cambiar mensaje de bienvenida por defecto para la lts

See merge request artica/pandorafms!5841
 2023-05-11 13:20:03 +00:00
miguel angel rasteu c3d8aa39bd #11161 Fix conditional to evaluate user_admin. Fix style CSS. Fix process_user_log 2023-05-11 14:48:06 +02:00
Matias Didier f93fbc558c Merge branch 'ent-11132-pantalla-en-blanco-al-crear-editar-paradas-programadas-al-seleccionar-los-modulos' into 'develop' 
Ent 11132 pantalla en blanco al crear editar paradas programadas al seleccionar los modulos

See merge request artica/pandorafms!5850
 2023-05-11 11:45:30 +00:00
Daniel Cebrian 6e3b7f4174 #10011 control period in report log 2023-05-11 12:14:06 +02:00
miguel angel rasteu 4d24126252 Fix same token for warning and about 2023-05-11 12:11:31 +02:00
Daniel Maya 45d6f2b5f5 #11179 Fixed heatmap and latest events 2023-05-11 12:05:00 +02:00
Jorge Rincon c0fb7f0f91 #11170 show module delete confirmation 2023-05-11 10:42:30 +02:00
Jorge Rincon c6e1b08885 #11167 Adjusted the action so that the message Could not be disabled is not displayed when deleting an agent 2023-05-11 09:31:56 +02:00
Daniel Cebrian 24848df3ba #1001 new item report for group elastic log 2023-05-10 17:47:20 +02:00
miguel angel rasteu f3b7a4aa09 Delete hd 2023-05-10 12:57:09 +02:00
miguel angel rasteu 1fc0a43ca8 #11158 Fixed entities in agent name and icon size 2023-05-10 12:53:03 +02:00
Daniel Maya 0fe67bf05a #11159 incresed size password 2023-05-10 10:41:59 +02:00
Pablo Aragon 7ed61cca75 10640-Report task 2023-05-10 08:43:29 +02:00
miguel angel rasteu da165e7f6c #11147 Change width of select 2023-05-09 14:56:14 +02:00
Diego Muñoz-Reja 4f134af222 Merge branch 'ent-11145-fallo-al-editar-modulos-wmi' into 'develop' 
Ent 11145 fallo al editar modulos wmi

See merge request artica/pandorafms!5859
 2023-05-09 12:06:54 +00:00
miguel angel rasteu f8f53a0b62 #9610 Add OS filter and OS version filter in bulk operation 2023-05-09 13:01:42 +02:00
Matias Didier ec2195f32f Merge branch 'ent-11047-15490-no-se-pueden-agregar-mas-campos-a-los-plugins' into 'develop' 
Ent 11047 15490 no se pueden agregar mas campos a los plugins

See merge request artica/pandorafms!5780
 2023-05-09 08:18:40 +00:00
Pablo Aragon be6fb97f26 11145-Password module: plugin, wmi, network 2023-05-09 10:02:47 +02:00
Pablo Aragon 886bde919b 11135-Move js code from ui_print_datatable 2023-05-08 14:25:57 +02:00
Jonathan c1c638bdfe #11132 fix downtime add all modules 2023-05-08 13:57:54 +02:00
miguel angel rasteu ddeea2f7ec #11087 Fix incorrect id in JS code 2023-05-08 13:54:31 +02:00
miguel angel rasteu 9f7679e936 #11068 Fix JS code 2023-05-08 12:59:10 +02:00
Jorge Rincon 257954c026 #11128 Fixed the usability of test connection buttons with integrations 2023-05-08 12:16:12 +02:00
miguel angel rasteu f9b7ac523e #11067 Fix IP target title 2023-05-08 11:59:08 +02:00
Daniel Rodriguez e96fda12eb Merge branch 'ent-11111-15539-modulos-web-check-vacios-en-el-agente' into 'develop' 
Ent 11111 15539 modulos web check vacios en el agente

See merge request artica/pandorafms!5833
 2023-05-08 09:44:06 +00:00
miguel angel rasteu bef0092388 #11111 Fix duplicated var 2023-05-08 11:22:55 +02:00
Daniel Rodriguez 5051f259a4 Merge branch 'ent-11095-15522-modulos-web-check-de-politica-vacios' into 'develop' 
Ent 11095 15522 modulos web check de politica vacios

See merge request artica/pandorafms!5825
 2023-05-08 09:03:23 +00:00
Jonathan ef2c62861b #11130 fix remove permisions users 2023-05-08 11:03:21 +02:00
Daniel Cebrian 3583c81fb9 #9771 fixed output summary 2023-05-08 10:51:25 +02:00
miguel angel rasteu a13560597c #11113 Fix html_print_input_text 2023-05-08 10:41:26 +02:00
Daniel Cebrian 042591c57b #9162 added new select for order columns in widgets 2023-05-08 10:35:59 +02:00
Pablo Aragon 7cf69ae101 11058-New welcome message 2023-05-08 08:49:35 +02:00
miguel angel rasteu f122405351 #10666 Fix column name 2023-05-08 08:16:59 +02:00
Rafael Ameijeiras 37d0cff221 Merge branch 'ent-10340-gotty-quickshell-no-funciona' into 'develop' 
Fix gotty host missing on ws.php

See merge request artica/pandorafms!5812
 2023-05-08 06:05:31 +00:00
Jorge Rincon 82db353dd1 #11098 The operation of the create module button from the SNPM Walk modal is adjusted 2023-05-05 14:10:41 +02:00
Calvo 4f48fa4450 Fix ws test button 2023-05-05 11:25:33 +02:00
daniel 77be60e4a3 fixed modules adopted pandora_enterprise#11103 2023-05-04 18:24:11 +02:00
Jorge Rincon 9ab9087377 #11098 The Create agent module button is enabled 2023-05-04 16:48:20 +02:00
Daniel Rodriguez 9b69ec4393 Merge branch 'ent-10179-wizard-deploy-agentes' into 'develop' 
Ent 10179 wizard deploy agentes

See merge request artica/pandorafms!5692
 2023-05-04 14:37:48 +00:00
miguel angel rasteu b3e97d9550 #11111 Fix module_manager_editor_web that it obtains the plugin_parameter data with the id of the tagente_modulo table 2023-05-04 16:01:35 +02:00
Calvo fb7a94ddd4 Fix ws exceptions on socket close event 2023-05-04 14:34:50 +02:00
Daniel Cebrian c0f5264dde #9686 new section for add policy in agent 2023-05-04 13:17:02 +02:00
daniel 5b0092c019 fix legacy VC pandora_enterprise#11054 2023-05-04 12:55:52 +02:00
Calvo c74ed4914b Websocket engine test button 2023-05-04 11:37:16 +02:00
daniel 5f3cbbb12a fixed visual errors in legacy VC pandora_enterprise#11054 2023-05-04 11:14:11 +02:00
Daniel Maya 78f4126700 #11050 Fixed critical instructions 2023-05-04 10:39:51 +02:00
Pablo Aragon a6212c2777 11094-Load fields plugin module 2023-05-04 10:35:32 +02:00
miguel angel rasteu f3488e2aa4 #11095 Fix id_policy_module in url 2023-05-04 09:43:48 +02:00
Pablo Aragon 4f9e09b84a 10815-Bulk operations do not edit modules created with policies 2023-05-03 17:01:21 +02:00
alejandro.campos@artica.es f2cbfd930c implement sql query item limit 2023-05-03 13:44:58 +02:00
miguel angel rasteu 6813eb9d11 #11090 Fix the count that gave an error when there are no tags and the sql error when putting offset-20 when there are no tag 2023-05-03 13:24:11 +02:00
Matias Didier 1d81b67082 Merge branch 'ent-10530-giss-demasiados-modulos-en-cola-en-vista-de-servidores' into 'develop' 
Ent 10530 giss demasiados modulos en cola en vista de servidores

See merge request artica/pandorafms!5688
 2023-05-03 09:25:04 +00:00
miguel angel rasteu 31852dd9c3 #11091 Change title of icons 2023-05-03 11:21:25 +02:00
Daniel Cebrian d2c26ba607 #11092 fixed response tactical view 2023-05-03 11:07:20 +02:00
miguel angel rasteu 5cb01d2079 #10860 Create function get_agent_module_childs 2023-05-03 09:20:40 +02:00
Daniel Cebrian 6c1041e000 #9771 change json format in summary 2023-04-28 11:44:05 +02:00
Daniel Cebrian 8c479a88a3 #9771 change json format in summary 2023-04-28 11:33:33 +02:00
Daniel Cebrian 58a52ff450 #9771 change json format in summary 2023-04-28 10:23:40 +02:00
Alejandro Campos 539ff07aec Merge branch 'develop' into 'ent-10179-wizard-deploy-agentes' 
# Conflicts:
#   pandora_console/include/styles/pandora.css
 2023-04-28 08:07:10 +00:00
miguel angel rasteu c1e35a5d17 #10081 Add option homescreen in metaconsole again 2023-04-28 09:51:30 +02:00
Daniel Rodriguez 191c7d3098 Merge branch 'ent-10820-15230-Mantener-el-estado-del-evento-anterior-con-Extra-ID' into 'develop' 
Ent 10820 15230 mantener el estado del evento anterior con extra

See merge request artica/pandorafms!5709
 2023-04-28 06:07:10 +00:00
Daniel Cebrian cdffdd5995 #9771 change in summary json 2023-04-27 17:51:57 +02:00
Daniel Cebrian d446812018 #986 changed behavior for ip custom when change with politic 2023-04-27 16:39:13 +02:00
Jonathan fdc13256cd #9478 create edit delete alerts from meta 2023-04-27 16:05:37 +02:00
miguel angel rasteu 728cc27396 #11068 Add option change to critical status 2023-04-27 15:34:42 +02:00
alejandro.campos@artica.es 857405b886 add target ip field to remote components 2023-04-27 11:13:19 +02:00
Daniel Cebrian bace7231b6 #9771 fusion warning if task is not finished 2023-04-27 10:35:09 +02:00
miguel angel rasteu 88d6e0e4f1 #11067 Add to the title the ip_target of the module when it exists. 2023-04-27 09:58:16 +02:00
alejandro.campos@artica.es 9f9aed4d77 add target ip field to remote components 2023-04-27 09:40:32 +02:00
Daniel Cebrian 966dc63a92 #9771 changes in summary and new fields for trecon_task 2023-04-26 17:16:34 +02:00
miguel angel rasteu 822bd7df8b #11037 Fix label 2023-04-26 16:24:05 +02:00
Jorge Rincon b6e0dd5998 #5344 validation of PDF fields for the open version 2023-04-26 13:05:50 +02:00
Daniel Cebrian cc2ab53db4 Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-04-26 13:02:13 +02:00
Pablo Aragon d346244004 2892-Remove Create by template, from description 2023-04-26 12:26:37 +02:00
Diego Muñoz-Reja 3e0c06b4b7 Merge branch 'ent-10769-Errores-en-Trap-console-y-Trap-editor' into 'develop' 
several minor fixes

See merge request artica/pandorafms!5638
 2023-04-26 08:57:03 +00:00
Jorge Rincon 4b74dc7e78 #10623 removal of the default text in the textarea description 2023-04-26 09:38:03 +02:00
miguel angel rasteu 85879d0a3a Fixed JS code that made the form look wrong 2023-04-26 09:37:48 +02:00
miguel angel rasteu 8108a84ba7 Fix incompatibility with Firefox 2023-04-25 16:47:52 +02:00
Daniel Cebrian d28cd1577b #10326 regenerate api token when update password 2023-04-25 15:43:02 +02:00
Rafael Ameijeiras 58af8f8d46 Merge branch 'ent-10899-consola-mete-entities-en-los-custom-fields-del-inventario' into 'develop' 
Ent 10899 consola mete entities en los custom fields del inventario

See merge request artica/pandorafms!5699
 2023-04-25 13:27:07 +00:00
Rafael Ameijeiras 5d943510be Merge branch 'ent-10363-15056-CPS-Disabled-desaparece-al-deshabilitarlo-en-Opciones-Avanzadas-de-Modulo' into 'develop' 
minor fix in cps selector

See merge request artica/pandorafms!5665
 2023-04-25 13:26:26 +00:00
Jonathan d1361e38cb #11047 fix macro in plugin section node+meta 2023-04-25 14:20:44 +02:00
Daniel Cebrian e1f995744b #10998 fixed acl edit my user 2023-04-25 10:57:21 +02:00
Daniel Cebrian 8b51aea36c #9771 changed format table for view json raw 2023-04-24 16:18:49 +02:00
Daniel Cebrian 4d927c2bb3 #9771 fixed bug 2023-04-24 15:41:55 +02:00
Daniel Cebrian 12fce7d891 #9771 added new status for task 2023-04-24 15:36:40 +02:00
Daniel Cebrian 65046caad4 #9771 added summary for extensions task 2023-04-24 15:28:54 +02:00
Daniel Maya 5f146ab340 #10530 Fix dialog and message 2023-04-21 14:36:32 +02:00
Jorge Rincon d23876c8aa #10981 fixed TCP Send-Receive fields in network modules 2023-04-21 14:30:42 +02:00
Daniel Cebrian 09e251bbd9 #9771 added warning when task is incomplete 2023-04-21 10:07:55 +02:00
Daniel Rodriguez af80e204de Merge branch 'ent-10255-14940-Funcionalidad-cuadro-naranja-en-las-consolas-visuales-cuando-hay-una-alerta' into 'develop' 
setup check to enable/disable vc item alert frame

See merge request artica/pandorafms!5668
 2023-04-20 17:22:57 +00:00
Jorge Rincon e064e0fd9a Fixed set for string type modules (async_string and generic_data_string) 2023-04-20 16:36:23 +02:00
Rafael Ameijeiras e5d2a346d4 Merge branch 'ent-10370-El-mensaje-en-nodo-para-administrar-agentes-aun-apunta-al-asistente-eliminado-en-Metaconsola' into 'develop' 
fixed metaconsole link

See merge request artica/pandorafms!5657
 2023-04-20 12:11:33 +00:00
Daniel Rodriguez f5a7dd40e9 Merge branch 'ent-10490-theme-base-de-tinymce' into 'develop' 
Ent 10490 theme base de tinymce

See merge request artica/pandorafms!5649
 2023-04-20 11:51:13 +00:00
Diego Muñoz-Reja 53bdaf66f9 Merge branch 'ent-10327-14975-version-snmp-erronea-en-componentes-remotos-personalizados' into 'develop' 
Ent 10327 14975 version snmp erronea en componentes remotos personalizados

See merge request artica/pandorafms!5676
 2023-04-20 11:26:13 +00:00
Matias Didier f8fe057459 Merge branch 'ent-11003-15459-campos-de-alertas-en-metaconsola-no-presentes-en-la-vista-principal-de-gestion-de' into 'develop' 
Ent 11003 15459 campos de alertas en metaconsola no presentes en la vista principal de gestion de

See merge request artica/pandorafms!5746
 2023-04-20 10:39:52 +00:00
Daniel Cebrian e05a19dc7f #10991 fixed acl in auth view 2023-04-20 12:24:52 +02:00
Rafael Ameijeiras f2be417a5e Merge branch 'ent-10955-fallos-de-estilos-en-discovery-netscan' into 'develop' 
Ent 10955 fallos de estilos en discovery netscan

See merge request artica/pandorafms!5739
 2023-04-20 08:32:37 +00:00
Daniel Cebrian b1d1dbb80f #11003 fixed alerts options in metaconsole 2023-04-20 09:42:42 +02:00
Rafael Ameijeiras b070eb9094 Merge branch 'ent-10974-inverse-interval-no-queda-seteado-tras-modificar-modulos-en-agente' into 'develop' 
Ent 10974 inverse interval no queda seteado tras modificar modulos en agente

See merge request artica/pandorafms!5727
 2023-04-20 07:28:08 +00:00
alejandro.campos@artica.es b293587aa9 implemented agent deploy wizard 2023-04-19 19:25:22 +02:00
alejandro.campos@artica.es 9553c42496 implemented agent deploy wizard 2023-04-19 19:21:38 +02:00
Jorge Rincon e1e72ca882 #10955 Fixed Netscan styling bugs. Group, module templates, Description 2023-04-19 15:51:51 +02:00
Rafael Ameijeiras 3199cc484b Merge branch 'ent-10330-14989-Safe-Operation-Mode-en-Bulks-Operations-de-Metaconsola' into 'develop' 
minor fix

See merge request artica/pandorafms!5673
 2023-04-19 12:41:32 +00:00
miguel angel rasteu 77b1212076 add new icon svg 2023-04-19 10:53:52 +02:00
Jorge Rincon dcecdd5590 Fixed the first part, group control 2023-04-18 17:13:39 +02:00
Daniel Cebrian 6df1c74722 Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-04-18 15:56:59 +02:00
miguel angel rasteu 4a250fc7c0 Trimmed tag name 2023-04-18 12:51:12 +02:00
Daniel Cebrian ea1ace2c71 #9771 added new discovery in menu 2023-04-18 12:48:14 +02:00
Daniel Cebrian b6379c4075 #9771 deleted buttons for task extensions list 2023-04-18 12:25:56 +02:00
miguel angel rasteu 2387cbd352 Check variable value to show error message 2023-04-18 12:14:25 +02:00
miguel angel rasteu 4d1e043236 Add width parameter on icons images 2023-04-18 11:08:43 +02:00
Matias Didier 0300f3723d Merge branch 'ent-10941-status-de-alerta-invisible' into 'develop' 
Ent 10941 status de alerta invisible

See merge request artica/pandorafms!5720
 2023-04-18 09:00:38 +00:00
Daniel Cebrian 660127b884 #9771 new task list view 2023-04-18 10:57:42 +02:00
Jonathan 726ab896f1 #10899 remove entities from inventory custom fields 2023-04-18 09:49:35 +02:00
Jorge Rincon e33fadb8eb #10974 Warning threshold Inverse Interval and Critical threshold Inverse Interval set 2023-04-18 09:31:22 +02:00
Daniel Cebrian 8183f7aa5d Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-04-17 15:48:23 +02:00
Daniel Cebrian 8e2bcc5651 #9771 remove table tdiscovery_apps_tasks from list task 2023-04-17 15:43:35 +02:00
Rafael Ameijeiras ec772f592d Merge branch 'ent-10803-no-hay-formulario-de-perfiles-al-crear-usuario' into 'develop' 
fix profiles and users pandora_enterprise#10803

See merge request artica/pandorafms!5721
 2023-04-17 12:44:16 +00:00
Matias Didier 75a40d3c5a Merge branch 'ent-10898-error-en-la-asignacion-de-grupo-secundario' into 'develop' 
Ent 10898 error en la asignacion de grupo secundario

See merge request artica/pandorafms!5697
 2023-04-17 12:27:23 +00:00
Daniel Cebrian 59271429b3 #9771 added custom section in discovery 2023-04-17 13:40:15 +02:00
miguel angel rasteu e0437d3fbd Fix duplicate code 2023-04-17 09:23:55 +02:00
Jonathan f6be23c353 #10899 json_ucescaped_unicode to inventory manage and visual fix 2023-04-14 12:24:39 +02:00
daniel 976633bc4f fix profiles and users pandora_enterprise#10803 2023-04-14 10:02:41 +02:00
Daniel Rodriguez 895b1bea7c Merge branch 'ent-10945-timestamp-desconocido-en-vista-de-eventos' into 'develop' 
Ent 10945 timestamp desconocido en vista de eventos

See merge request artica/pandorafms!5717
 2023-04-13 14:53:45 +00:00
miguel angel rasteu 65cfb69bfc #10941 remove class table_action_buttons to make alert status visible ever 2023-04-13 15:47:45 +02:00
Rafael Ameijeiras 357893d2c0 Merge branch 'ent-10911-icono-de-borrar-enorme-en-edicion-de-elementos-de-custom-report' into 'develop' 
Ent 10911 icono de borrar enorme en edicion de elementos de custom report

See merge request artica/pandorafms!5718
 2023-04-13 13:06:07 +00:00
miguel angel rasteu 10c7d4dddb #15263 created filter for modules 2023-04-13 13:54:11 +02:00
miguel angel rasteu b043717df5 #15263 created filter for modules 2023-04-13 13:49:05 +02:00
Jonathan 85052a948d #10911 fix visual delete icon size 2023-04-13 12:30:07 +02:00
Daniel Maya a8277dc19f #10945 Fix timestamp 2023-04-13 12:25:18 +02:00
Jorge Rincon 53d813fa0b #10353 Removed name validation for new network components 2023-04-13 11:36:57 +02:00
miguel angel rasteu c26db22fa5 #10563 Move menu item Links from Management to Operation. Add button in setup to global disable the Feedback functionality 2023-04-13 11:07:09 +02:00
Jonathan 7d9fb5c77a #10730 Regular expresion inventory reports 2023-04-13 10:42:37 +02:00
Daniel Cebrian 60700000fe Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-04-12 18:28:55 +02:00
alejandro.campos@artica.es 23f0ffdf9e Keep In process status for new events with same extra id 2023-04-12 17:46:10 +02:00
alejandro.campos@artica.es 2ca27ae15d Keep In process status for new events with same extra id 2023-04-12 17:32:52 +02:00
Daniel Rodriguez 7ae8f185b0 Merge branch 'ent-10909-se-han-roto-los-iconos-de-grupo-de-agentes-en-v770' into 'develop' 
Ent 10909 se han roto los iconos de grupo de agentes en v770

See merge request artica/pandorafms!5701
 2023-04-12 15:29:44 +00:00
Daniel Maya a42c235cab #10917 Fix icon 2023-04-12 14:44:01 +02:00
Jorge Rincon 32c8109cbe #10266 added tip visual setup option in Open version 2023-04-12 14:17:10 +02:00
Daniel Maya 2bb016474a #10909 Fix icon group 2 2023-04-12 13:37:51 +02:00
Matias Didier 5a38024e25 Merge branch 'ent-10320-no-pide-confirmacion-al-eliminar-usuario' into 'develop' 
Ent 10320 no pide confirmacion al eliminar usuario

See merge request artica/pandorafms!5678
 2023-04-12 11:03:01 +00:00
Daniel Cebrian 3652317270 Merge branch 'develop' 2023-04-12 12:37:39 +02:00
Daniel Maya d006bc3c3a #10909 Fix icon group 2023-04-12 12:23:54 +02:00
Matias Didier ad3f1dd8d6 Merge branch 'ent-10526-derivado-del-trabajo-de-q-a-en-ticket-https-brutus-artica-es-8081-artica-pandora_enterprise' into 'develop' 
Ent 10526 derivado del trabajo de q a en ticket https brutus artica es 8081 artica pandora enterprise

See merge request artica/pandorafms!5691
 2023-04-12 10:16:24 +00:00
Jonathan 1a05c71e78 #10526 fix create module dialog 2023-04-12 10:44:20 +02:00
Jonathan aa9fefd30c #10899 entities inventory and correction visual style 2023-04-12 10:25:35 +02:00
Matias Didier 310496f135 Merge branch 'ent-10258-bug-en-edicion-de-accion-mail-to-admin' into 'develop' 
Ent 10258 bug en edicion de accion mail to admin

See merge request artica/pandorafms!5680
 2023-04-12 07:47:35 +00:00
Pablo Aragon c21397476e 10898-Assign secondary groups in agent view 2023-04-12 08:21:26 +02:00
Jonathan 2164e0d9a2 #10526 tree view modal show on create agent 2023-04-11 14:57:53 +02:00
Daniel Rodriguez 57c6788a19 Merge branch 'ent-10891-no-tenemos-local-components-en-open' into 'develop' 
Ent 10891 no tenemos local components en open

See merge request artica/pandorafms!5685
 2023-04-11 12:26:31 +00:00
Jonathan f98303b3ba #10891 Local components for enterprise menu 2023-04-11 12:14:18 +02:00
alejandro.campos@artica.es db663be86d minor fix 2023-04-11 10:30:40 +02:00
Pablo Aragon 564085ee01 10258-Event mail to admin 2023-04-11 09:52:49 +02:00
Pablo Aragon a3ed2b1f6b 10320-Confirm delete user 2023-04-10 16:10:44 +02:00
Pablo Aragon bf76104350 10327-Change snmp_version when network_component change 2023-04-10 15:41:18 +02:00
alejandro.campos@artica.es 3b7e57c93f implemented massive edition of safe operation mode 2023-04-10 12:33:18 +02:00
alejandro.campos@artica.es c2a21a42ca implemented massive edition of safe operation mode 2023-04-10 12:31:49 +02:00
alejandro.campos@artica.es 40b8bcf0eb minor fix 2023-04-10 10:48:51 +02:00
Jonathan 55fc0c57ad Merge branch 'develop' into ent-10864-conflicto-mergeo-fichero-ver_agentes-php 2023-04-10 09:24:30 +02:00
alejandro.campos@artica.es d0aa931f46 setup check to enable/disable vc item alert frame 2023-04-05 16:24:46 +02:00
Daniel Rodriguez ccadd5157a Merge branch 'ent-7427-nexcon-datos-de-monitorizacion-con-origen-en-netflow' into 'develop' 
Ent 7427 nexcon datos de monitorizacion con origen en netflow

See merge request artica/pandorafms!5604
 2023-04-05 11:55:20 +00:00
Jonathan 17a9d6020f #10864 Solution conflict files removed 2023-04-05 12:52:44 +02:00
alejandro.campos@artica.es 1b93472426 minor fix in cps selector 2023-04-05 12:38:23 +02:00
Daniel Cebrian 7e05b9bccb #9771 created installation system with .disco file 2023-04-05 09:24:37 +02:00
alejandro.campos@artica.es 795ccb14e6 fixed metaconsole link 2023-04-04 13:57:53 +02:00
Jimmy Olano 89aa227b98 Merge branch 'ent-10734-sistema-de-favoritos-no-actualiza-nombre-en-el-menu-lateral-del-objeto-favorito-consola-visual' into 'develop', JJOS. 
Ent 10734 sistema de favoritos no actualiza nombre en el menu lateral del objeto favorito consola visual

See merge request artica/pandorafms!5613
 2023-04-04 11:57:45 +00:00
Jonathan 99b07a2fb2 Conflict solution 2023-04-04 11:35:26 +02:00
Jonathan 000ab68327 #10490 TinyMCE Upgrade V6 2023-04-04 11:24:49 +02:00
Daniel Cebrian 5872d37d39 #9771 fixed new tables task list 2023-04-04 09:37:17 +02:00
Pablo Aragon e4c8097e9c 10402 remove passwords box & 10856 vcard 2023-04-04 09:24:29 +02:00
Daniel Cebrian 5a6cea6588 #9771 added extensions app in task list 2023-04-03 17:18:20 +02:00
Matias Didier e4b718a468 Merge branch 'ent-10839-problema-con-buscador-agentes' into 'develop' 
Ent 10839 problema con buscador agentes

See merge request artica/pandorafms!5642
 2023-04-03 06:58:55 +00:00
Jonathan 8d950c3672 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-31 13:37:59 +02:00
Jonathan e8e7dcc5ec Actions select bulk operations view 2023-03-31 13:37:43 +02:00
daniel c315a7f8c5 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-31 13:31:39 +02:00
Pablo Aragon 2f619d1ef6 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-31 10:45:43 +02:00
Pablo Aragon 426690bc35 10843 & 10844 2023-03-31 10:44:51 +02:00
Daniel Rodriguez ca16c5dd61 Merge branch 'ent-10441-control-de-cache-en-actualizaciones' into 'develop' 
Ent 10441 control de cache en actualizaciones

See merge request artica/pandorafms!5623
 2023-03-31 07:33:26 +00:00
daniel d6a1155dbb fixed styles 2023-03-31 08:45:54 +02:00
daniel 24e5fca884 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-30 17:34:06 +02:00
Pablo Aragon 3a2cbb7a62 Datatables & styles fix 2023-03-30 16:50:30 +02:00
Matias Didier 9344bd16c9 Merge branch 'ent-10525-15104-netflow-no-esta-mostrando-correctamente-todos-los-datos' into 'develop' 
Unified default netflow interval and deleted from console setup

See merge request artica/pandorafms!5614
 2023-03-30 12:39:06 +00:00
Daniel Maya 6bfdfa5a3b 10839 Fixed search 2023-03-30 14:09:02 +02:00
daniel f2e1b2ef57 fixed styles 2023-03-30 12:36:05 +02:00
Pablo Aragon e03e1e45ed Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-30 12:26:06 +02:00
Pablo Aragon 5e24706f71 Style fix 2023-03-30 12:25:45 +02:00
Daniel Cebrian f442272177 Merge branch 'develop' into ent-10633-pantalla-de-timeout 2023-03-30 09:30:38 +02:00
Daniel Cebrian b9fc352578 merge develop into ent-10633-pantalla-de-timeout 2023-03-30 09:15:10 +02:00
daniel 2c1301f542 fixed styles 2023-03-30 08:59:40 +02:00
daniel 1262fee2e8 fixed styles 2023-03-30 08:43:23 +02:00
alejandro.campos@artica.es e8323e4b00 several minor fixes 2023-03-29 17:45:37 +02:00
daniel 8458716ba9 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-29 17:27:57 +02:00
Pablo Aragon 2b121a2fd2 New qrcode.js version & vcard 2023-03-29 15:34:03 +02:00
Matias Didier 4297481c35 Merge branch 'ent-10819-guardia-15316-alertas-en-vista-de-alertas-tienen-icono-de-politica-sin-estar-en-ellas' into 'develop' 
Ent 10819 guardia 15316 alertas en vista de alertas tienen icono de politica sin estar en ellas

See merge request artica/pandorafms!5633
 2023-03-29 12:32:44 +00:00
Daniel Maya 3af2637a7c #10819 Fixed img 2023-03-29 13:37:07 +02:00
Diego Muñoz-Reja 35a1c2332d Merge branch 'ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob' into 'develop' 
implemented consoles management

See merge request artica/pandorafms!5558
 2023-03-28 15:33:37 +00:00
Alejandro Campos e909686ddc Merge branch 'develop' into 'ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob' 
# Conflicts:
#   pandora_console/extras/mr/62.sql
 2023-03-28 14:09:33 +00:00
Jonathan 53194f7c3d Reports visual changes 2023-03-28 11:04:52 +02:00
Jonathan 87946161f3 Solution conflict 2023-03-28 09:30:18 +02:00
Jonathan 81be0da7fd Module manager editor relations visual change 2023-03-28 09:17:47 +02:00
daniel 19ddbdc30a fixed styles 2023-03-28 08:34:05 +02:00
daniel ebffb004e9 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-27 21:22:06 +02:00
daniel 0461881420 fixed styles 2023-03-27 17:13:23 +02:00
Pablo Aragon 98f812b757 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-27 17:03:45 +02:00
Pablo Aragon 55ff0e0597 wux and wmi 2023-03-27 17:03:38 +02:00
daniel 48a254c4b2 fixed styles 2023-03-27 14:34:05 +02:00
Daniel Cebrian fd9dfcf08f Merge branch 'develop' into 'ent-10665-version-open-edicion-del-propio-usuario-y-gestion-de-usuarios-devuelve-error-500' 
# Conflicts:
#   pandora_console/install.php
 2023-03-27 11:01:24 +00:00
Daniel Cebrian aeab39737b Merge branch 'develop' into ent-10665-version-open-edicion-del-propio-usuario-y-gestion-de-usuarios-devuelve-error-500 2023-03-27 12:11:59 +02:00
daniel 3beec9bfab fixed styles 2023-03-27 11:47:08 +02:00
Jonathan 665976e011 Bulks masive visual action buttons 2023-03-27 11:10:51 +02:00
Jonathan f8aefa6e34 Merge conflict solution 2023-03-27 08:31:00 +02:00
daniel abf9fcf200 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-24 14:05:30 +01:00
daniel 25ea15fe0f fixed styles 2023-03-24 14:04:38 +01:00
Calvo c4ef22164b Merge remote-tracking branch 'origin/develop' into ent-7427-nexcon-datos-de-monitorizacion-con-origen-en-netflow 2023-03-24 10:38:44 +01:00
Daniel Cebrian da742bc15e #10441 added version file in js 2023-03-24 09:13:22 +01:00
Rafael Ameijeiras a30ba4cf27 Merge branch 'ent-9624-meter-soporte-a-sflow-en-nuestro-gestor-de-flujos' into 'develop' 
Ent 9624 meter soporte a sflow en nuestro gestor de flujos

See merge request artica/pandorafms!5587
 2023-03-24 07:25:52 +00:00
daniel 96d03ca31c Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-23 17:47:58 +01:00
Pablo Aragon 0fa79e44f1 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-23 17:44:16 +01:00
daniel bac1a7bf65 fixed styles 2023-03-23 17:44:06 +01:00
Pablo Aragon 122f45fcaa Metasetup 2023-03-23 17:44:04 +01:00
Daniel Rodriguez b09d65dd91 Merge branch 'ent-10010-mejorar-filtrado-logs-en-informe-de-logs' into 'develop' 
Ent 10010 mejorar filtrado logs en informe de logs

See merge request artica/pandorafms!5602
 2023-03-23 11:46:49 +00:00
daniel 95834b2de7 fixed styles 2023-03-23 12:41:39 +01:00
Pablo Aragon 8b163cd100 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-22 16:42:15 +01:00
Pablo Aragon b0b2778c4a 10760-Setup 2023-03-22 16:42:03 +01:00
Calvo 96017090ce Netflow monitoring filters forms 2023-03-22 14:22:17 +01:00
Jonathan c52ca613b2 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-22 14:22:08 +01:00
Jonathan a063c7a0ac Fix header and menu 2023-03-22 14:21:56 +01:00
daniel e82de5d6aa fixed styles 2023-03-22 14:08:03 +01:00
Calvo 784bd2dbcf Merge remote-tracking branch 'origin/develop' into ent-7427-nexcon-datos-de-monitorizacion-con-origen-en-netflow 2023-03-22 12:31:11 +01:00
daniel 5eaa4a10bb fixed styles 2023-03-22 11:13:56 +01:00
Rafael Ameijeiras 87421e772d Merge branch 'develop' into 'ent-9624-meter-soporte-a-sflow-en-nuestro-gestor-de-flujos' 
# Conflicts:
#   pandora_console/install.php
 2023-03-22 08:23:07 +00:00
Pablo Aragon 583ec8209c Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-21 18:12:11 +01:00
Pablo Aragon 99b845db3f progress bar 2023-03-21 18:12:02 +01:00
Jonathan e2615b9593 Visual changes header 2023-03-21 17:02:03 +01:00
Jonathan 93f5b62bd2 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-21 14:23:15 +01:00
Jonathan a960644975 Omnishell fix view 2023-03-21 14:23:12 +01:00
daniel 64fc4bcd46 fixed styles 2023-03-21 14:06:28 +01:00
Pablo Aragon e8744b5d12 10712-New login 2023-03-21 13:31:11 +01:00
Calvo a69151a3ca Merge remote-tracking branch 'origin/develop' into ent-7427-nexcon-datos-de-monitorizacion-con-origen-en-netflow 2023-03-21 11:23:02 +01:00
Daniel Cebrian 563e9e15c4 #9624 fixed conflics 2023-03-21 10:30:35 +01:00
Jonathan 82dd6ebb37 Metaconsole view reports change 2023-03-21 09:52:21 +01:00
Daniel Cebrian 9dea38f440 Merge branch 'develop' into ent-9624-meter-soporte-a-sflow-en-nuestro-gestor-de-flujos 2023-03-21 09:38:56 +01:00
Jonathan a1144ce7ab Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-17 13:35:46 +01:00
Jonathan de538a10cb setup Performance visual changes 2023-03-17 13:35:43 +01:00
daniel 594d34931c fixed styles 2023-03-17 13:20:58 +01:00
Daniel Cebrian b81b7ce7af #fixed in fav menu when change name the original name 2023-03-17 12:25:43 +01:00
Jonathan fd5347e893 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-17 12:15:13 +01:00
Jonathan dfbdfbaf60 Create module message error correction 2023-03-17 12:15:10 +01:00
daniel a9633085bc fixed styles 2023-03-17 12:00:51 +01:00
Calvo 284e20fc8a Unified default netflow interval and deleted from console setup 2023-03-17 10:58:58 +01:00
daniel f83acb99f0 fixed create user and add profile 2023-03-17 10:09:11 +01:00
Jonathan c219ad91c7 Visual minor fix 2023-03-17 08:53:58 +01:00
daniel 0934b75cbd fixed styles 2023-03-17 08:10:19 +01:00
daniel 3f09fd16a7 fixed styles 2023-03-16 18:51:54 +01:00
Jose Gonzalez 211f29c0f9 Websocket engine and quickshell 2023-03-16 17:49:57 +01:00
Jose Gonzalez bbb1855d81 External Tools 2023-03-16 17:38:51 +01:00
daniel a22b5479d9 fixed styles 2023-03-16 16:48:03 +01:00
Jose Gonzalez 1500edc06e Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-16 16:33:22 +01:00
Jose Gonzalez 6d37781255 Minor fixes visual styles 2023-03-16 16:33:08 +01:00
Jonathan 921e949947 cluster visual fix link 2023-03-16 16:06:03 +01:00
Jonathan d006c93297 Create update module msg error on open 2023-03-16 15:38:08 +01:00
Jose Gonzalez 9508d2d572 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-16 13:11:22 +01:00