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

38675 Commits

Author SHA1 Message Date
Jose Martin 14f2e10fee Merge branch 'ent-13351-iconos-incorrectos-en-vista-apliacion-de-coleccion-a-un-agente-tema-oscuro' into 'develop' 
Ent 13351 iconos incorrectos en vista apliacion de coleccion a un agente tema oscuro

See merge request artica/pandorafms!7145
 2024-04-08 10:30:44 +00:00
Daniel Cebrian ad78d1632e #13376 fixed error 500 2024-04-08 12:28:57 +02:00
daniel 6c4c43daee fixed mergetool pandora_enterprise#13063 2024-04-08 12:22:31 +02:00
Jose Martin b336b09789 Merge branch 'ent-13338-pestanas-ventana-subir-crear-ficheros-directorios-se-ven-mal-colecciones' into 'develop' 
Ent 13338 pestanas ventana subir crear ficheros directorios se ven mal colecciones

See merge request artica/pandorafms!7144
 2024-04-08 10:02:47 +00:00
Diego Muñoz-Reja 55d97b7556 Merge branch 'ent-13212-error-calculo-modulos-agente-visto-fenix' into 'develop' 
Ent 13212 error calculo modulos agente visto fenix

See merge request artica/pandorafms!7130
 2024-04-08 09:24:00 +00:00
Daniel Rodriguez 9b4d33ce77 Merge branch 'ent-12721-nuevo-modo-de-licencia-trial' into 'develop' 
Ent 12721 nuevo modo de licencia trial

See merge request artica/pandorafms!6846
 2024-04-08 08:12:41 +00:00
Jose Martin d637e7734f Merge branch 'ent-13331-vista-de-inventario-basico-de-agentes-muestra-deshabilitados' into 'develop' 
Ent 13331 Vista de inventario básico de Agentes muestra deshabilitados

See merge request artica/pandorafms!7140
 2024-04-08 07:44:08 +00:00
Pablo Aragon 6231beaea0 Merge branch 'develop' into ent-13185-ligera-modificacion-en-el-header 2024-04-08 09:02:35 +02:00
Pablo Aragon fa4f330be4 13351-Fix background color collection icon 2024-04-08 08:47:39 +02:00
artica 345bb6fe19 Auto-updated build strings. 2024-04-08 01:00:04 +02:00
artica 255eb75d0c Auto-updated build strings. 2024-04-07 01:00:04 +02:00
artica 0f0c170bec Auto-updated build strings. 2024-04-06 01:00:06 +02:00
Juan Antonio Loarte aec6f81fb9 Merge branch 'ent-12973-17187-tamano-de-la-etiqueta-de-un-elemento-en-consola-visual-ocupa-mucho-espacio-extra' into 'develop' 
Ent 12973 17187 tamano de la etiqueta de un elemento en consola visual ocupa mucho espacio extra

See merge request artica/pandorafms!7039
 2024-04-05 11:49:52 +00:00
Matias Didier 652f9a53b9 Merge branch 'ent-12893-usuario-sin-grupo' into 'develop' 
added check to group deletion

See merge request artica/pandorafms!6983
 2024-04-05 11:45:03 +00:00
Diego Muñoz-Reja 2ec7be8405 Merge branch 'ent-13276-cambios-warp-update-open' into 'develop' 
Ent 13276 cambios warp update open

See merge request artica/pandorafms!7122
 2024-04-05 10:50:02 +00:00
Daniel Rodriguez 66504dd425 Merge branch 'ent-12934-cambio-sistema-despliegue-de-agentes' into 'develop' 
Ent 12934 Cambio sistema despliegue de agentes

See merge request artica/pandorafms!6962
 2024-04-05 09:56:40 +00:00
Pablo Aragon c45e95b395 13338-Add border in modal tabs 2024-04-05 11:50:01 +02:00
Jonathan 939b571a87 #12893 fix double graphs message 2024-04-05 11:44:19 +02:00
Jonathan 5824d52ff3 #13059 fix bugs agent module view 2024-04-05 11:11:13 +02:00
Daniel Cebrian 43f8d5888c #13322 fixed event comment filter 2024-04-05 09:49:17 +02:00
Pablo Aragon 9c2e998356 12941-Fix translation. Fix bulks (agents, modules and policies) 2024-04-05 09:43:55 +02:00
Jose Martin 376c94a015 Merge branch 'ent-13165-casque-en-plugin-de-seguridad' into 'develop' 
Fixed pandora_security_check plugin

See merge request artica/pandorafms!7135
 2024-04-05 07:39:15 +00:00
Pablo Aragon 0d11040641 Merge branch 'develop' into ent-12941-Tiempos-de-intervalo-1-min 2024-04-05 08:59:42 +02:00
Jose Martin af5e96158d Merge branch 'ent-13252-cli-pfms-subrutina-no-definida-en-el-comando-agent_update_custom_fields-en-ubuntu-22' into 'develop' 
Changes on CLI -pandora_update_agent_custom_field

See merge request artica/pandorafms!7124
 2024-04-05 06:50:56 +00:00
Pablo Aragon 220e5e0c0a Merge branch 'develop' into ent-13148-vistas-vacias 2024-04-05 08:30:52 +02:00
Pablo Aragon 20d06ee09f Merge remote-tracking branch 'origin/develop' into ent-13148-vistas-vacias 2024-04-05 08:28:46 +02:00
Pablo Aragon cccdeb6a38 13148-Empty views - AWS 2024-04-05 08:27:23 +02:00
artica 5746d00dea Auto-updated build strings. 2024-04-05 01:00:05 +02:00
Félix Suárez 96a6c4fd22 Handle update when fields doesnt exist 2024-04-04 15:27:47 -06:00
Daniel Cebrian 23f9866a1c #13322 fixed filter comment 2024-04-04 20:27:43 +02:00
Daniel Cebrian 68a53b8a57 #13331 added status filter in datatables inventory 2024-04-04 19:19:50 +02:00
Daniel Cebrian 6a3c9024e1 #13331 fixed filter in inventory 2024-04-04 18:54:36 +02:00
Pablo Aragon a1e9c20f0b 13148-Empty views 2024-04-04 18:35:56 +02:00
Jonathan 1a58501af9 #13059 fix bugs dashboard agent module view 2024-04-04 18:21:10 +02:00
Juan Antonio Loarte 8bbced19b1 Merge branch 'ent-13247-error-de-la-api-pfms-2-0-sobre-ubuntu-22' into 'develop' 
13247 add a2enmod rewrite to ubuntu  install

See merge request artica/pandorafms!7136
 2024-04-04 16:03:13 +00:00
Daniel Cebrian 915a7b95ae #13331 fixed date filter 2024-04-04 17:21:52 +02:00
Matias Didier 185e59de54 Merge branch 'ent-13314-bordes-blancos-en-tema-negro-de-la-tactical-view-son-muy-feos' into 'develop' 
Ent 13314 bordes blancos en tema negro de la tactical view son muy feos

See merge request artica/pandorafms!7133
 2024-04-04 15:00:18 +00:00
Pablo Aragon 848e7dd5b0 Merge branch 'develop' into ent-13314-bordes-blancos-en-tema-negro-de-la-tactical-view-son-muy-feos 2024-04-04 16:58:14 +02:00
Pablo Aragon 0b137bee71 13148-Empty views - VMware view 2024-04-04 16:56:00 +02:00
Jose Martin 1be22b6741 Merge branch 'ent-13221-create_event-en-cli-no-recoge-unknown-instructions' into 'develop' 
Ent-13221-create_event-en-cli-no-recoge-unknown-instructions

See merge request artica/pandorafms!7137
 2024-04-04 14:55:52 +00:00
Daniel Cebrian bade6328f9 #13331 added filter status in inventory and fixed date 2024-04-04 16:52:34 +02:00
Diego Muñoz-Reja 4b6fd8ef33 Merge branch 'ent-13129-eliminar-del-script-de-instalacion-offline-el-antiguo-websocket-engine-y-modificar-contrasenas' into 'develop' 
13129 remove websocket engine from online installer

See merge request artica/pandorafms!7113
 2024-04-04 14:47:51 +00:00
Matias Didier 3a08e4a167 Merge branch 'ent-13286-menu-full-screen-de-eventos-queda-mal' into 'develop' 
Ent 13286 menu full screen de eventos queda mal

See merge request artica/pandorafms!7126
 2024-04-04 14:34:48 +00:00
Pablo Aragon a535d4b14b 13148-Empty views - VMware view 2024-04-04 16:01:05 +02:00
Pablo Aragon feeef9a5f2 13191-Fix background color trap severity 2024-04-04 13:40:59 +02:00
Daniel Rodriguez fd4c36f6d0 Merge branch 'ent-13244-limte-generacion-informes' into 'develop' 
Ent 13244 Limte generación informes

See merge request artica/pandorafms!7118
 2024-04-04 11:21:28 +00:00
Pablo Aragon b2c719ea95 Merge branch 'develop' into ent-13314-bordes-blancos-en-tema-negro-de-la-tactical-view-son-muy-feos 2024-04-04 12:12:29 +02:00
Pablo Aragon e519f78aba Merge branch 'develop' into ent-13286-menu-full-screen-de-eventos-queda-mal 2024-04-04 12:07:52 +02:00
Daniel Cebrian 58b0cf39dd #13332 fixed csv export in datatable preload 2024-04-04 11:27:16 +02:00
Daniel Rodriguez 8788160d81 Merge branch 'ent-13090-en-informes-opcion-sql-query-el-campo-sql-query-no-acepta-variables-de-macro' into 'develop' 
Ent-13090-en-informes-opcion-sql-query-el-campo-sql-query-no-acepta-variables-de-macro

Closes pandora_enterprise#13090

See merge request artica/pandorafms!7093
 2024-04-04 08:52:53 +00:00