1776 Commits

Author SHA1 Message Date
Daniel Cebrian
48d7a63eb1 #12149 added post_max_size notification 2024-02-01 14:54:23 +01:00
Daniel Maya
688f235c6b #12687 Fixed export with json_ref 2 2024-02-01 10:48:34 +01:00
Daniel Maya
9337cc28e7 #12687 added recursive function 2024-01-31 11:41:20 +01:00
Daniel Maya
7acd687b9b #12687 Fixed export with json_ref 2024-01-31 09:21:27 +01:00
Daniel Maya
a83577d1a8 #12687 Added import/export prd 4 2024-01-30 17:34:37 +01:00
Daniel Cebrian
f68615cba0 #12460 fixed deprecated 2024-01-30 17:00:38 +01:00
Jonathan
f430d3ce9f #12797 fix select2 2024-01-30 14:53:48 +01:00
Daniel Cebrian
c0ad547625 #12460 fixed deprecated 2024-01-30 13:14:54 +01:00
Daniel Maya
e07d89883f #12687 Added import/export prd 3 2024-01-29 17:38:01 +01:00
Daniel Cebrian
22598b4bc2 #12460 fixed deprecated 2024-01-29 17:31:19 +01:00
Daniel Cebrian
fd8d233cf8 #12460 fixed deprecated 2024-01-24 13:28:43 +01:00
Daniel Maya
401b1973be #12687 Added import/export prd 2 2024-01-24 12:15:16 +01:00
Daniel Rodriguez
b11651aa6e Merge branch 'ent-12580-16708-modulos-webserver-no-loguean-y-devuelven-critico' into 'develop'
Ent-12580-16708-modulos-webserver-no-loguean-y-devuelven-critico

Closes pandora_enterprise#12580

See merge request artica/pandorafms!6791
2024-01-23 09:20:40 +00:00
Daniel Maya
95f8519d5d #12687 Added import/export prd 2024-01-22 17:22:23 +01:00
Daniel Cebrian
a9c16e1f69 #12538 added url in new notificacions 2024-01-22 10:55:37 +01:00
Daniel Cebrian
d85a488cb0 #12538 new notifications in console supervisor 2024-01-22 10:37:03 +01:00
Daniel Cebrian
fadb70d740 Merge branch 'develop' into ent-12537-display-de-mensajes-no-tiene-en-cuenta-los-tipos 2024-01-19 13:06:37 +01:00
Matias Didier
a4f67d353b Merge branch 'ent-12725-16851-tree-view-no-marca-agentes-en-estado-quiet' into 'develop'
Ent 12725 16851 tree view no marca agentes en estado quiet

See merge request artica/pandorafms!6849
2024-01-19 11:36:30 +00:00
Rafael Ameijeiras
510a06a347 Merge branch 'ent-12579-formato-erroneo-de-los-botones-accion-sobre-agentes-del-Satellite-Server' into 'develop'
Ent 12579 formato erroneo de los botones accion sobre agentes del satellite server

See merge request artica/pandorafms!6747
2024-01-18 12:56:43 +00:00
Rafael Ameijeiras
030d34224e Merge branch 'ent-12523-Problemas-visualizacion-de-eventos-de-auditoria' into 'develop'
some changes in audit view

See merge request artica/pandorafms!6754
2024-01-18 12:50:40 +00:00
Rafael Ameijeiras
1f64fb6115 Merge branch 'ent-12320-wizard-de-bienvenida-mas-molon-visualmente' into 'develop'
Ent 12320 wizard de bienvenida mas molon visualmente

See merge request artica/pandorafms!6842
2024-01-18 11:16:08 +00:00
Matias Didier
bfa087413c Merge branch 'ent-12560-notificacion-del-alert-correlation-changed-in-v774-sigue-apareciendo' into 'develop'
Ent 12560 notificacion del alert correlation changed in v774 sigue apareciendo

See merge request artica/pandorafms!6770
2024-01-18 08:45:26 +00:00
Jonathan
234f4d2df1 #12579 add title on images 2024-01-15 14:32:52 +01:00
Jonathan
ed165423fd #12725 add quiet agent tree view 2024-01-15 09:38:29 +01:00
Pablo Aragon
12f6f2e02b 12320-Welcome wizard new styles 2024-01-11 09:33:51 +01:00
Jonathan
d8a5f1a521 #12560 fix type 2024-01-08 16:35:37 +01:00
Daniel Cebrian
22baa45387 #12537 new icons for notifications 2024-01-03 11:39:15 +01:00
miguel angel rasteu
696ca72a80 #12684 Fix tree view filter 2023-12-27 13:20:36 +01:00
miguel angel rasteu
dd322ad283 Merge branch 'develop' into ent-12684-vista-tree-view-no-filtra-por-modulo-en-algunas-pestanas 2023-12-27 13:02:22 +01:00
Daniel Cebrian
8f69c109d5 #12686 fixed filter in tree module tag 2023-12-26 17:55:41 +01:00
Daniel Cebrian
590c7f7480 #12686 fixed filter in tree module group 2023-12-26 17:22:19 +01:00
Daniel Cebrian
83c6d3735e #12688 fixed filter module status in tree 2023-12-26 17:06:16 +01:00
miguel angel rasteu
d6363d37b7 #12684 Fix tree view filter 2023-12-26 13:22:24 +01:00
Rafael Ameijeiras
5bdf1b0766 Merge branch 'ent-12398-actualizar-los-enlaces-de-ayuda-movidos-en-el-12287-2' into 'develop'
Ent 12398 actualizar los enlaces de ayuda movidos en el 12287 2

See merge request artica/pandorafms!6758
2023-12-21 12:00:44 +00:00
Calvo
421eb1fe23 Merge remote-tracking branch 'origin/develop' into ent-12236-varios-bugs-en-modulos-predictivos-de-politica 2023-12-19 18:59:07 +01:00
Daniel Rodriguez
d4e6c09acb Merge branch 'ent-10906-Carga-de-datos-de-demo' into 'develop'
implement demo data feature

See merge request artica/pandorafms!6606
2023-12-19 15:40:09 +00:00
felix.suarez
0d33a412ae Remove additional concatenation 2023-12-19 08:56:54 -06:00
daniel
855fc32a7d Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
Conflicts:
	pandora_console/include/javascript/pandora.js
	pandora_console/include/styles/pandora.css
2023-12-19 09:39:24 +01:00
Daniel Maya
0ac20717f1 #12200 resolved conflict 2023-12-18 13:15:42 +01:00
Alejandro Campos
c700633fce Merge branch 'develop' into 'ent-10906-Carga-de-datos-de-demo'
# Conflicts:
#   pandora_console/extras/mr/67.sql
#   pandora_console/pandoradb.sql
2023-12-18 10:54:27 +00:00
daniel
8aeee6d876 Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 2023-12-18 11:15:18 +01:00
Daniel Rodriguez
3fe41179e0 Merge branch 'ent-12216-Entradas-fantasma-para-elementos-de-discovery-offline' into 'develop'
Ent 12216 entradas fantasma para elementos de discovery offline

See merge request artica/pandorafms!6740
2023-12-15 09:22:10 +00:00
daniel
ea97bb8f60 Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 2023-12-14 13:27:03 +01:00
Diego Muñoz-Reja
60a2557878 Merge branch 'ent-10116-14775-service-view-widget-no-tiene-filtro-de-grupos-y-recursion' into 'develop'
Ent 10116 14775 service view widget no tiene filtro de grupos y recursion

See merge request artica/pandorafms!6451
2023-12-14 11:19:25 +00:00
Matias Didier
352434d69a Merge branch 'ent-12132-bug-en-welcome-tips-con-muchos-tips' into 'develop'
Ent 12132 bug en welcome tips con muchos tips

See merge request artica/pandorafms!6557
2023-12-14 11:03:37 +00:00
daniel
2890fd3dab Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
Conflicts:
	pandora_console/include/styles/pandora.css
2023-12-14 11:05:29 +01:00
Jonathan
6e150c1bc2 #12560 alert update manager 2023-12-14 08:59:13 +01:00
Rafael Ameijeiras
645c2d886a Merge branch 'ent-12390-item-heatmap-se-rompe-al-no-elegir-grupo' into 'develop'
Ent 12390 item heatmap se rompe al no elegir grupo

See merge request artica/pandorafms!6652
2023-12-13 12:17:10 +00:00
daniel
cc12c77008 Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
Conflicts:
	pandora_console/include/styles/pandora.css
2023-12-13 10:39:48 +01:00
Jonathan
c593161525 #12398 change urls wiki 2023-12-12 12:22:51 +01:00