36011 Commits

Author SHA1 Message Date
miguel angel rasteu
fddc709aee #11219 Fix transaltes 2023-08-02 14:48:02 +02:00
Rafael Ameijeiras
507c91ab1e Merge branch 'ent-11683-faltan-opciones-en-las-listas-de-dias-especiales' into 'develop'
Ent 11683 Faltan opciones en las listas de días especiales

See merge request artica/pandorafms!6221
2023-08-02 12:01:07 +00:00
Rafael Ameijeiras
b23397ef82 Merge branch 'ent-11707-iconos-de-modulos-en-tree-view-estan-pegados-al-texto' into 'develop'
Ent 11707 iconos de modulos en tree view estan pegados al texto

See merge request artica/pandorafms!6229
2023-08-02 11:43:31 +00:00
miguel angel rasteu
3f85562f21 #10177 Fix server name 2023-08-02 13:42:11 +02:00
Enrique Martin
c301925c0b Merge branch 'ent-11756-plugintools-python' of https://brutus.artica.es:8081/artica/pandorafms into ent-11756-plugintools-python 2023-08-02 13:13:49 +02:00
Enrique Martin
f5df8eb24c Added Agent class functions 2023-08-02 13:13:43 +02:00
Rafael Ameijeiras
f692dd4c7d Merge branch 'ent-11693-15876-inverse-interval-no-se-activa-para-modulos-web-server-de-tipo-string' into 'develop'
Ent 11693 15876 inverse interval no se activa para modulos web server de tipo string

See merge request artica/pandorafms!6218
2023-08-02 10:43:12 +00:00
Rafael Ameijeiras
e6eee88a63 Merge branch 'ent-11377-users-bulk-operations-usuarios-con-perfil-x-anadido-no-aparecen-al-intentar-borrar-perfil' into 'develop'
Ent 11377 users bulk operations usuarios con perfil x anadido no aparecen al intentar borrar perfil

See merge request artica/pandorafms!6010
2023-08-02 10:42:36 +00:00
miguel angel rasteu
0a799c51e6 #10701 D3 Tree implementation, links and colors 2023-08-02 12:29:20 +02:00
alejandro
538a25d2d5 clean imports 2023-08-02 12:05:51 +02:00
alejandro
a214864957 edit readme 2023-08-02 12:00:17 +02:00
Enrique Martin
bde41cac3d Removed loop imports 2023-08-02 11:52:24 +02:00
Enrique Martin
54dc1df12d Set some default values to None 2023-08-02 11:42:20 +02:00
Enrique Martin
8f72e9b6e7 Changed definition format 2023-08-02 11:38:49 +02:00
Enrique Martin
3a5949ac5e Changed global variables names and minor changes 2023-08-02 11:32:34 +02:00
alejandro.campos@artica.es
27766d9650 remove snmp version 2 2023-08-02 11:07:24 +02:00
alejandro.campos@artica.es
8074448bfd remove snmp version 2 2023-08-02 11:07:08 +02:00
Enrique Martin
3c5ee4e03b Added multiprocessing functions 2023-08-02 10:31:52 +02:00
Rafael Ameijeiras
d96977b883 Merge branch 'ent-10562-Nueva-vista-de-detalle-de-alertas-encoladas' into 'develop'
Ent 10562 nueva vista de detalle de alertas encoladas

See merge request artica/pandorafms!6273
2023-08-02 08:26:50 +00:00
Rafael Ameijeiras
25b2532c7a Merge branch 'ent-11777-API-add-event-comment-se-ha-roto-cambios-tevent-comment' into 'develop'
fixed api call

See merge request artica/pandorafms!6288
2023-08-02 08:26:10 +00:00
Jonathan
7e8b26b73a Merge branch 'develop' into ent-11693-15876-inverse-interval-no-se-activa-para-modulos-web-server-de-tipo-string 2023-08-02 09:29:42 +02:00
Jonathan
f063c5182e #11693 fix warning/critical inverse for serverdata 2023-08-02 09:26:14 +02:00
miguel angel rasteu
57df761622 #11377 Fix sql query 2023-08-02 09:11:55 +02:00
Daniel Maya
ae22b99835 Merge branch 'develop' into ent-11739-compatibilidad-php-8-2-second 2023-08-02 09:10:04 +02:00
artica
d3fdb28d05 Auto-updated build strings. 2023-08-02 01:00:29 +02:00
miguel angel rasteu
ca42714fca #10701 include d3 v7 2023-08-01 14:56:44 +02:00
Daniel Maya
aef7f0edd0 #11739 Fixed deprecated functions 4 2023-08-01 14:51:31 +02:00
alejandro.campos@artica.es
700bb53df4 implemented pending alerts list for event server 2023-08-01 14:37:16 +02:00
Rafael Ameijeiras
965184c688 Merge branch 'ent-11629-neflow-filter-no-admite-grupo-all' into 'develop'
Ent 11629 neflow filter no admite grupo all

See merge request artica/pandorafms!6151
2023-08-01 12:33:07 +00:00
Rafael Ameijeiras
b052711c92 Merge branch 'ent-11697-arreglar-menu-sin-click-to-display' into 'develop'
Draft: Ent 11697 arreglar menu sin click to display

See merge request artica/pandorafms!6230
2023-08-01 12:32:37 +00:00
Jonathan
cf1e274456 #11697 fix menu display lateral 2023-08-01 13:54:48 +02:00
Jonathan
3b38824ca7 #11697 arrow left menu collapse 2023-08-01 13:06:43 +02:00
alejandro.campos@artica.es
30784cc992 implemented inventory widget 2023-08-01 11:47:37 +02:00
Rafael Ameijeiras
ece276e724 Merge branch 'ent-11571-contact-details' into 'develop'
Ent 11571 contact details

See merge request artica/pandorafms!6161
2023-08-01 09:32:46 +00:00
Daniel Maya
0d321f5311 #11739 Fixed deprecated functions 3 2023-08-01 11:19:04 +02:00
Jonathan
84df4e1195 #11571 fix for firefox margin api token span 2023-08-01 11:11:24 +02:00
Jonathan
629f43c8f5 Merge branch 'develop' into ent-11571-contact-details 2023-08-01 10:27:40 +02:00
alejandro.campos@artica.es
8fdc841254 Merge remote-tracking branch 'origin/develop' into ent-10602-Inventory-Widget 2023-08-01 09:58:37 +02:00
alejandro.campos@artica.es
78e76e1ad3 implemented inventory widget 2023-08-01 09:57:49 +02:00
Jonathan
f2328407b1 Merge branch 'develop' into ent-10639-unificacion-de-controles-de-fecha 2023-08-01 09:39:56 +02:00
Rafael Ameijeiras
9f36729d30 Merge branch 'ent-11771-15990-configuracion-de-modulos-de-plugin-en-politicas-en-metaconsola-se-muestran-vacias' into 'develop'
Ent 11771 15990 configuracion de modulos de plugin en politicas en metaconsola se muestran vacias

See merge request artica/pandorafms!6291
2023-08-01 07:28:27 +00:00
artica
dcb9f89b5d Auto-updated build strings. 2023-08-01 01:00:44 +02:00
Jorge Rincon
e7c2340e72 #11771 Fixed plugin field operation in module creation/edition 2023-07-31 15:30:39 +02:00
Rafael Ameijeiras
f65a4ddca9 Merge branch 'ent-11755-netflow-live-view-tipo-summary-no-muestra-grafica-al-usar-aggregated-by-ports' into 'develop'
Ent 11755 netflow live view tipo summary no muestra grafica al usar aggregated by ports

See merge request artica/pandorafms!6279
2023-07-31 13:11:34 +00:00
Rafael Ameijeiras
75b311ad97 Merge branch 'ent-11768-texto-del-modal-de-save-filter-se-muestra-mal' into 'develop'
Ent 11768 texto del modal de save filter se muestra mal

See merge request artica/pandorafms!6287
2023-07-31 13:10:53 +00:00
Rafael Ameijeiras
02bf721e39 Merge branch 'ent-11751-15966-metaconsola-no-se-exportan-los-eventos-a-csv' into 'develop'
Ent 11751 15966 metaconsola no se exportan los eventos a csv

See merge request artica/pandorafms!6269
2023-07-31 13:04:24 +00:00
Rafael Ameijeiras
0c4331f9d4 Merge branch 'ent-11351-15668-snmp-alerts-crea-alerta-sin-tener-ningun-dato-puesto-en-formulario' into 'develop'
Ent 11351 15668 snmp alerts crea alerta sin tener ningun dato puesto en formulario

See merge request artica/pandorafms!5988
2023-07-31 11:08:29 +00:00
Rafael Ameijeiras
68b2fbd616 Merge branch 'ent-11467-bug-en-vista-tree-view' into 'develop'
Ent 11467 bug en vista tree view

See merge request artica/pandorafms!6276
2023-07-31 10:12:33 +00:00
miguel angel rasteu
ded7bb1017 #11751 Fix reset 2023-07-31 11:49:29 +02:00
miguel angel rasteu
63923e3599 Merge branch 'develop' into ent-11751-15966-metaconsola-no-se-exportan-los-eventos-a-csv 2023-07-31 11:28:59 +02:00