Commit Graph

33683 Commits

Author SHA1 Message Date
miguel angel rasteu cccb03010c #10851 change date order to asc and fix sql query 2023-05-25 10:30:34 +02:00
miguel angel rasteu 9da8e83633 Modified the timestamp according to input data. Added query with the timestamp of the filter. 2023-04-18 09:52:59 +02:00
Rafael Ameijeiras e495f79de8 Merge branch 'ent-10303-ruta-de-fping-en-conf-por-defecto' into 'develop'
ent-10303 add fping check and dinamic configuration on pandora_server.conf

See merge request artica/pandorafms!5728
2023-04-18 07:11:22 +00:00
rafael 6c63fc0520 ent-10303 add fping check and dinamic configuration on pandora_server.conf 2023-04-18 09:08:58 +02:00
artica b1a5e9e473 Auto-updated build strings. 2023-04-18 01:00:17 +02:00
Rafael Ameijeiras 852e7ae2a0 Merge branch 'ent-10714-mejoras-de-usabilidad-en-vista-de-inventario-export-csv' into 'develop'
Ent 10714 mejoras de usabilidad en vista de inventario export csv

See merge request artica/pandorafms!5726
2023-04-17 15:40:19 +00:00
Matias Didier e468c306b9 Merge branch 'ent-10848-mejorar-aspecto-de-formulario-de-graficas-de-interfaces-y-de-las-graficas-de-modulo' into 'develop'
Ent 10848 mejorar aspecto de formulario de graficas de interfaces y de las graficas de modulo

See merge request artica/pandorafms!5669
2023-04-17 14:50:32 +00:00
Pablo Aragon 54767d20a3 10848-Small input graph form 2023-04-17 15:30:56 +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
Rafael Ameijeiras 54326a444b Merge branch 'ent-10813#15305-Botones-101-no-funcionan-cuando-buscas-modulos-en-el-buscador' into 'develop'
Ent 10813#15305 botones 101 no funcionan cuando buscas modulos en el buscador

See merge request artica/pandorafms!5723
2023-04-17 12:34:13 +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
Jonathan cbf122f4c6 #10714 csv inventory button 2023-04-17 14:11:16 +02:00
Matias Didier e4fd12f6de Merge branch 'ent-10067-anadir-filtro-alerts-triggered-en-tree-view-y-widget-tree-view' into 'develop'
Ent 10067 anadir filtro alerts triggered en tree view y widget tree view

See merge request artica/pandorafms!5662
2023-04-17 11:06:10 +00:00
Rafael Ameijeiras e4e6c613a3 Merge branch 'ent-10950-cambiar-a-mysql8-en-las-instalaciones-por-defecto' into 'develop'
10950 update install script

See merge request artica/pandorafms!5722
2023-04-17 08:40:43 +00:00
rafael ad40d9d788 10950 Set mysql version to 80 on the online script 2023-04-17 09:40:22 +02:00
artica 3c01ffa27f Auto-updated build strings. 2023-04-17 01:00:12 +02:00
Pablo Aragon 0fa03f28b3 10067-Alerts triggered filter tree view 2023-04-16 20:21:29 +02:00
Pablo Aragon 6bc185e148 10848-confict 2023-04-16 18:06:54 +02:00
artica a493a9b0b4 Auto-updated build strings. 2023-04-16 01:00:39 +02:00
artica c4adfa7755 Auto-updated build strings. 2023-04-15 01:00:16 +02:00
Jorge Rincon 4a4c3a0cdb #10813 Adjustment of the buttons in the Graph column 2023-04-14 11:05:55 +02:00
rafael 6f340d4e81 10950 update install script 2023-04-14 10:06:26 +02:00
daniel 976633bc4f fix profiles and users pandora_enterprise#10803 2023-04-14 10:02:41 +02:00
artica c84e416f44 Auto-updated build strings. 2023-04-14 01:00:11 +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
Rafael Ameijeiras 57ec600bd1 Merge branch 'ent-10912-enlaces-a-agente-en-la-vista-tactica-de-grupo-lleva-a-la-edicion-de-agente-deberia-ir-a-la' into 'develop'
Ent 10912 enlaces a agente en la vista tactica de grupo lleva a la edicion de agente deberia ir a la

See merge request artica/pandorafms!5716
2023-04-13 13:07:05 +00: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
Rafael Ameijeiras b1ef24cae9 Merge branch 'ent-9464-14144-limitacion-en-el-campo-de-seleccion-etiquetas-metaconsola' into 'develop'
Ent 9464 14144 limitacion en el campo de seleccion etiquetas metaconsola

See merge request artica/pandorafms!5698
2023-04-13 12:49:43 +00:00
Rafael Ameijeiras 652432b660 Merge branch 'ent-10730-pequena-mejora-en-informes-de-inventario' into 'develop'
Ent 10730 pequena mejora en informes de inventario

See merge request artica/pandorafms!5712
2023-04-13 12:47:04 +00:00
Rafael Ameijeiras b78acc28ca Merge branch 'ent-10310-14620-Widget-General-group-status-no-funciona-correctamente-en-la-Metaconsola' into 'develop'
fixed group link on General group status widget

See merge request artica/pandorafms!5711
2023-04-13 12:45:19 +00:00
Rafael Ameijeiras dbba723c08 Merge branch 'ent-10918-pantallas-de-fondo-de-la-vista-de-login' into 'develop'
Ent 10918 pantallas de fondo de la vista de login

See merge request artica/pandorafms!5708
2023-04-13 12:33:42 +00:00
Matias Didier bf7397157c Merge branch 'ent-10002-cli-anadir-comentarios-con-usuario-con-espacios-no-mete-el-nombre-en-el-comentario' into 'develop'
Ent 10002 cli anadir comentarios con usuario con espacios no mete el nombre en el comentario

See merge request artica/pandorafms!5679
2023-04-13 11:49:31 +00: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
Jonathan 7730ca6469 #10912 link to agent view in tactical group view 2023-04-13 12:16:32 +02:00
Jonathan 7d9fb5c77a #10730 Regular expresion inventory reports 2023-04-13 10:42:37 +02:00
Ramon Novoa 0e8a74a4b8 Revert "Test GitLab hooks."
This reverts commit c8b6be3e92.
2023-04-13 10:37:10 +02:00
Matias Didier 250d65d94a Merge branch 'ent-10740-mejoras-en-heatmap' into 'develop'
Ent 10740 mejoras en heatmap

See merge request artica/pandorafms!5660
2023-04-13 08:24:18 +00:00
Ramon Novoa c8b6be3e92 Test GitLab hooks. 2023-04-13 10:17:50 +02:00
alejandro.campos@artica.es 153b978778 fixed group link on General group status widget 2023-04-13 09:18:55 +02:00
slerena a0426757b5 Minor changes of default conf for better clarificacion. Updated header (c) info and removed old log4x unused code. 2023-04-13 05:38:14 +00:00
artica 19bb879cfc Auto-updated build strings. 2023-04-13 01:01:23 +02:00
Rafael Ameijeiras 5df8a8141c Merge branch 'ent-10929-anadir-dependencias-y-chromium-version-a-las-imagenes-de-docker-open-y-enterprise' into 'develop'
ent-10929 adding dependencies and fixed chromium version to docker community image

See merge request artica/pandorafms!5710
2023-04-12 18:25:08 +00:00
rafael c88b223424 ent-10929 adding dependencies and fixed chromium version to docker community image 2023-04-12 19:48:17 +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 3a9b8d31bf fix icons pandora_enterprise#10909 2023-04-12 17:21:27 +02:00
Pablo Aragon 2d8d501fe8 10918-Fix login background & text 2023-04-12 17:21:18 +02:00
daniel b186d51329 fix icons pandora_enterprise#10909 2023-04-12 17:06:58 +02:00
Daniel Maya cd030620b2 #10909 Fix icon group 4 2023-04-12 15:51:02 +02:00
Daniel Rodriguez 01e831312d Merge branch 'ent-10917-iconos-de-so-personalizados-se-ven-rotos' into 'develop'
Ent 10917 iconos de so personalizados se ven rotos

See merge request artica/pandorafms!5707
2023-04-12 13:50:30 +00:00