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

7607 Commits

Author SHA1 Message Date
Daniel Rodriguez 84f61c9022 Merge branch 'ent-10265-eliminar-gestion-de-mapas-via-ntop-antigua-funcionalidad-deprecada' into 'develop' 
Ent-10265-eliminar-gestion-de-mapas-via-ntop-antigua-funcionalidad-deprecada

See merge request artica/pandorafms!6028
 2023-07-27 10:27:55 +00:00
Rafael Ameijeiras 9ce383d2ec Merge branch 'ent-11739-compatibilidad-php-8-2' into 'develop' 
Ent 11739 compatibilidad php 8 2

See merge request artica/pandorafms!6286
 2023-07-27 09:17:24 +00:00
Daniel Cebrian 2c9f7e026e Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-07-26 15:58:26 +02:00
Daniel Maya bee65bc575 #11739 Fixed deprecated functions 2023-07-26 14:18:20 +02:00
Daniel Rodriguez c2d7c10442 Merge branch 'ent-11606-Quitar-consolas-visuales-legacy' into 'develop' 
remove legacy visual console

See merge request artica/pandorafms!6140
 2023-07-26 11:09:44 +00:00
Rafael Ameijeiras d046e82208 Merge branch 'ent-11644-desaparece-selector-en-bulk-operations-en-nodo-centralizado' into 'develop' 
Ent 11644 desaparece selector en bulk operations en nodo centralizado

See merge request artica/pandorafms!6168
 2023-07-25 11:04:38 +00:00
Rafael Ameijeiras b4742f9e46 Merge branch 'ent-11698-proteccion-en-cascada-de-modulos-no-se-puede-configurar' into 'develop' 
Ent 11698 proteccion en cascada de modulos no se puede configurar

See merge request artica/pandorafms!6216
 2023-07-25 10:34:53 +00:00
Daniel Rodriguez 4b6be6596e Merge branch 'ent-10640-meter-programador-de-informes-en-la-vista-de-edicion-de-un-informe-en-una-nueva-solapa' into 'develop' 
Ent 10640 meter programador de informes en la vista de edicion de un informe en una nueva solapa

See merge request artica/pandorafms!5858
 2023-07-25 10:02:12 +00:00
Rafael Ameijeiras 391447c307 Merge branch 'ent-11708-error-al-visualizar-el-boton-de-delete-en-metaconsola-en-category-management' into 'develop' 
Ent 11708 error al visualizar el boton de delete en metaconsola en category management

See merge request artica/pandorafms!6231
 2023-07-25 09:05:16 +00:00
Rafael Ameijeiras 85a3e32c27 Merge branch 'ent-11421-Config-remota-del-servidor-no-accesible-si-no-hay-dataserver' into 'develop' 
show server conf remote edition in at least one server element

See merge request artica/pandorafms!6197
 2023-07-25 09:03:51 +00:00
Rafael Ameijeiras 7f2918990c Merge branch 'ent-11360-intervalo-en-1-hora-por-defecto-en-item-de-informe-module-histogram-graph' into 'develop' 
Ent 11360 intervalo en 1 hora por defecto en item de informe module histogram graph

See merge request artica/pandorafms!6166
 2023-07-25 07:53:48 +00:00
Rafael Ameijeiras 458226e24d Merge branch 'ent-11754-15970-error-de-paginacion-de-custom_graphs' into 'develop' 
Ent 11754 15970 error de paginacion de custom graphs

See merge request artica/pandorafms!6267
 2023-07-25 07:52:11 +00:00
alejandro.campos@artica.es 31ec1b8209 Merge remote-tracking branch 'origin/develop' into ent-11421-Config-remota-del-servidor-no-accesible-si-no-hay-dataserver 2023-07-24 13:49:28 +02:00
Rafael Ameijeiras db62d257df Merge branch 'ent-11716-text-area-plugin-parameters-se-rompe-si-no-anadimos-espacios' into 'develop' 
Ent 11716 text area plugin parameters se rompe si no anadimos espacios

See merge request artica/pandorafms!6244
 2023-07-24 10:52:56 +00:00
Pablo Aragon ccf124103d 11135-Move js code from ui_print_datatable. Resolve conflict 2023-07-24 10:46:19 +02:00
Pablo Aragon 2a89a494cc 10640-Report task. Resolve conflict 2023-07-24 10:06:43 +02:00
Pablo Aragon 8389169e16 Merge branch 'develop' into ent-10640-meter-programador-de-informes-en-la-vista-de-edicion-de-un-informe-en-una-nueva-solapa 2023-07-24 08:40:33 +02:00
Daniel Rodriguez 4148074996 Merge branch 'ent-11012-Flag-Experimental-para-la-consola' into 'develop' 
added setup token

See merge request artica/pandorafms!6133
 2023-07-21 07:23:33 +00:00
miguel angel rasteu 9978bbe645 #11754 Add pagination 2023-07-20 09:42:09 +02:00
Rafael Ameijeiras 06d3664b2f Merge branch 'ent-10254-15114-anadir-timeout-y-secondary-server-a-ad' into 'develop' 
Ent 10254 [#15114]Añadir timeout y secondary server a AD

See merge request artica/pandorafms!6091
 2023-07-18 10:14:29 +00:00
Daniel Cebrian 41a03a7a49 Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-07-18 09:27:14 +02:00
Rafael Ameijeiras 9ad7ea0d6f Merge branch 'ent-11420-botones-incorrectos-en-config-remota-del-servidor' into 'develop' 
Ent 11420 botones incorrectos en config remota del servidor

See merge request artica/pandorafms!6035
 2023-07-17 11:12:17 +00:00
Daniel Maya c333ffcf0a #11420 fixed url and added buttons 2023-07-17 08:59:32 +02:00
Rafael Ameijeiras 8d423fa0ad Merge branch 'ent-2892-6602-borrar-en-descripcion-de-modulo-mensaje-de-que-ha-sido-creado-a-traves-de-plantilla' into 'develop' 
Ent 2892 6602 borrar en descripcion de modulo mensaje de que ha sido creado a traves de plantilla

See merge request artica/pandorafms!5791
 2023-07-17 06:02:29 +00:00
Rafael Ameijeiras 9cec3e1ba5 Merge branch 'ent-5344-seleccionables-de-pdf-en-open-reports' into 'develop' 
Ent 5344 seleccionables de pdf en open reports

See merge request artica/pandorafms!5792
 2023-07-17 05:59:15 +00:00
Rafael Ameijeiras d860d613d6 Merge branch 'ent-10598-nuevo-wizard-de-bienvenida' into 'develop' 
Ent 10598 nuevo wizard de bienvenida

See merge request artica/pandorafms!6043
 2023-07-17 05:57:29 +00:00
Rafael Ameijeiras 9499e50eea Merge branch 'ent-9686-crear-seccion-de-politicas-dentro-del-agente' into 'develop' 
Ent 9686 crear seccion de politicas dentro del agente

See merge request artica/pandorafms!5830
 2023-07-14 06:58:00 +00:00
Rafael Ameijeiras d9b95c08ed Merge branch 'ent-11719-selector-de-modulos-en-las-alertas-del-agente-no-muestra-los-modulos-del-agente-solo-en-nodo' into 'develop' 
Ent 11719 selector de modulos en las alertas del agente no muestra los modulos del agente solo en nodo

See merge request artica/pandorafms!6237
 2023-07-13 10:43:46 +00:00
Rafael Ameijeiras 9e3dcbd390 Merge branch 'ent-11331-editar-tarea-de-google-cloud-te-lleva-a-discovery' into 'develop' 
Ent 11331 editar tarea de google cloud te lleva a discovery

See merge request artica/pandorafms!5957
 2023-07-13 10:43:03 +00:00
Daniel Cebrian 20c225e410 Merge branch 'develop' into ent-9686-crear-seccion-de-politicas-dentro-del-agente 2023-07-13 10:16:52 +02:00
Diego Muñoz-Reja 57058c4f9c Merge branch 'ent-11266-no-se-habilita-el-log-de-consola-en-770-ni-771' into 'develop' 
Ent 11266 no se habilita el log de consola en 770 ni 771

See merge request artica/pandorafms!6001
 2023-07-13 07:55:47 +00:00
Daniel Cebrian 4f26bc2d51 #9686 fixed pagination in policies manager 2023-07-13 08:56:58 +02:00
Jonathan ab590f6493 #11716 fix size plugins preview 2023-07-12 16:24:46 +02:00
Jonathan 5ba8b4d1ad Merge branch 'develop' into ent-11687-giss-anchura-insuficiente-en-columna-de-agentes-al-utilizar-operaciones-masivas-de-eliminar 2023-07-12 15:30:55 +02:00
Jonathan 0f1b8fce02 #11719 fix modules create alert 2023-07-12 12:11:50 +02:00
Jonathan d5335da885 #11687 overflow fix 2023-07-12 12:05:17 +02:00
Jonathan eada8e0652 #11687 fix errors agents and checks 2023-07-12 11:26:33 +02:00
Diego Muñoz-Reja a7c0866be0 Merge branch 'ent-11293-lista-de-reportes-en-metaconsola' into 'develop' 
Ent 11293 lista de reportes en metaconsola

See merge request artica/pandorafms!5952
 2023-07-12 07:16:35 +00:00
Jonathan 8b0c9af7a8 #11687 fix style delete modules 2023-07-12 08:41:30 +02:00
Jonathan 93571d1eb6 #11708 fix delete image category metaconsole 2023-07-11 14:10:55 +02:00
Matias Didier f5f71531ee Merge branch 'ent-9756-anadir-escalado-de-estados-a-op-masivas' into 'develop' 
Ent 9756 anadir escalado de estados a op masivas

See merge request artica/pandorafms!6079
 2023-07-11 10:48:55 +00:00
Jonathan f734b46a80 #9756 fix warning critical status remove duplicate 2023-07-11 12:21:16 +02:00
Diego Muñoz-Reja 3c3889e343 Merge branch 'ent-11161-campo-innecesario-y-no-solicitado-al-cambiar-contrasena-de-usuario-3-errores-distintos' into 'develop' 
Ent 11161 campo innecesario y no solicitado al cambiar contrasena de usuario 3 errores distintos

See merge request artica/pandorafms!5887
 2023-07-11 07:56:21 +00:00
Daniel Cebrian aae86cd7ee Merge branch 'develop' into ent-10012-item-grafico-coincidencias-informe-logs 2023-07-10 16:04:04 +02:00
Daniel Cebrian f3ee738fcc Merge branch 'develop' into ent-10012-item-grafico-coincidencias-informe-logs 2023-07-10 16:02:02 +02:00
Matias Didier 02f173e39d Merge branch 'ent-11612-en-alert-templates-se-permite-crear-plantillas-con-nombres-vacios' into 'develop' 
Ent 11612 en alert templates se permite crear plantillas con nombres vacios

See merge request artica/pandorafms!6135
 2023-07-10 13:07:53 +00:00
Gorka Sanchez bd9e62540f Merge branch 'ent-11701-aparicion-de-columnas-raras-en-detalles-de-alertas' into 'develop' 
Ent 11701 aparicion de columnas raras en detalles de alertas

See merge request artica/pandorafms!6219
 2023-07-10 11:46:54 +00:00
Miguel Angel Rasteu 3001cc90ce Merge branch 'develop' into 'ent-11161-campo-innecesario-y-no-solicitado-al-cambiar-contrasena-de-usuario-3-errores-distintos' 
# Conflicts:
#   pandora_console/godmode/users/user_management.php
 2023-07-10 09:45:11 +00:00
miguel angel rasteu a215620f2e #11701 Fix alert view 2023-07-10 11:39:43 +02:00
Diego Muñoz-Reja d7d5519e29 Merge branch 'ent-11327-14544-limite-de-macros-al-editar-el-plugin-no-permite-anadir-nuevo-parametro' into 'develop' 
Ent 11327 14544 limite de macros al editar el plugin no permite anadir nuevo parametro

See merge request artica/pandorafms!6005
 2023-07-10 09:36:37 +00:00