696ca72a80
#12684 Fix tree view filter
2023-12-27 13:20:36 +01:00
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
8f69c109d5
#12686 fixed filter in tree module tag
2023-12-26 17:55:41 +01:00
590c7f7480
#12686 fixed filter in tree module group
2023-12-26 17:22:19 +01:00
83c6d3735e
#12688 fixed filter module status in tree
2023-12-26 17:06:16 +01:00
d6363d37b7
#12684 Fix tree view filter
2023-12-26 13:22:24 +01:00
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
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
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
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
0ac20717f1
#12200 resolved conflict
2023-12-18 13:15:42 +01:00
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
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
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
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
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
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
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
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
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
c593161525
#12398 change urls wiki
2023-12-12 12:22:51 +01:00
206bdc4acb
Merge branch 'ent-12168-GISS-Jerarquia-en-vista-de-arbol-de-servicios-no-se-muestra-bien-al-hacer-búsquedas-en-el-filtro-Nodo-y-Meta' into 'develop'
...
Ent 12168 giss jerarquia en vista de arbol de servicios no se muestra bien al hacer búsquedas en el filtro nodo y meta
See merge request artica/pandorafms!6547
2023-12-11 14:45:36 +00:00
ab370f1cf6
Merge branch 'ent-12096-arreglar-apostrofe-en-texto-let-s-do-it-del-mensaje-de-bienvenida' into 'develop'
...
Ent 12096 arreglar apostrofe en texto let s do it del mensaje de bienvenida
See merge request artica/pandorafms!6484
2023-12-11 14:45:06 +00:00
7f75445d75
Merge branch 'ent-11537-bug-en-cuadros-de-busqueda-con-los-caracteres-2-y-0' into 'develop'
...
Ent 11537 bug en cuadros de busqueda con los caracteres 2 y 0
See merge request artica/pandorafms!6410
2023-12-11 14:30:51 +00:00
43fd67b072
Merge branch 'ent-12058-incluir-version-de-mysql-en-about-y-diagnostic-info' into 'develop'
...
Ent 12058 incluir version de mysql en about y diagnostic info
See merge request artica/pandorafms!6481
2023-12-11 14:28:31 +00:00
c8e7e1e375
Added text to welcome wizard
2023-12-11 12:08:50 +01:00
0bdc6978e6
Merge branch 'develop' into 'ent-10906-Carga-de-datos-de-demo'
...
# Conflicts:
# pandora_console/extras/mr/67.sql
# pandora_console/pandoradb.sql
2023-12-05 15:30:06 +00:00
457f8e9448
some changes in discovery
2023-12-05 16:07:14 +01:00
60137eb300
changes in discovery extensions
2023-12-05 11:32:19 +01:00
77cf0ce6ca
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-05 08:02:55 +01:00
75ddb3b934
minor changes in demo data functionality
2023-12-04 11:37:12 +01:00
b89f182e19
#12213 Resolve conflicts
2023-12-01 10:31:50 +01:00
c4e5a3bebd
Merge branch 'ent-12088-colocar-enlace-de-la-consola-web-en-mensaje-del-correo-electronico-cuando-no-se-tenga-acceso' into 'develop'
...
Ent 12088 colocar enlace de la consola web en mensaje del correo electronico cuando no se tenga acceso
See merge request artica/pandorafms!6501
2023-11-30 12:48:00 +00:00
ca17eef68a
implement load demo data
2023-11-29 18:09:32 +01:00
eebab43e36
Merge branch 'ent-11907-incluir-distro-y-version-en-about-y-diagnostic-info' into 'develop'
...
Ent 11907 incluir distro y version en about y diagnostic info
See merge request artica/pandorafms!6420
2023-11-29 14:34:05 +00:00
f6f0f15731
Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
...
Conflicts:
pandora_console/godmode/reporting/reporting_builder.item_editor.php
pandora_console/include/graphs/fgraph.php
pandora_console/include/lib/Dashboard/Widgets/single_graph.php
pandora_console/include/styles/pandora.css
2023-11-28 08:29:10 +01:00
64cb2ad912
Merge branch 'ent-11911-welcome-dialog-no-detecta-bien-el-correo-configurado' into 'develop'
...
Ent 11911 welcome dialog no detecta bien el correo configurado
See merge request artica/pandorafms!6440
2023-11-28 07:07:26 +00:00
4406828cc2
Merge branch 'ent-12362-no-se-pueden-anadir-alertas-a-modulos-desde-la-vista-agents-alerts-view' into 'develop'
...
Fix add alerts pandora_enterprise#12362
See merge request artica/pandorafms!6625
2023-11-27 14:37:09 +00:00
9919de1d66
Merge branch 'ent-11026-si-el-token-automatically-check-for-updates-esta-desactivado-no-debe-mostrar-aviso-para' into 'develop'
...
Ent 11026 si el token automatically check for updates esta desactivado no debe mostrar aviso para
See merge request artica/pandorafms!6392
2023-11-27 12:24:45 +00:00
d544ef4ac5
Merge branch 'ent-8686-13248-anadir-buscador-de-grupos-en-agent-management-tree-group-de-metaconsola' into 'develop'
...
Ent 8686 13248 anadir buscador de grupos en agent management tree group de metaconsola
See merge request artica/pandorafms!6539
2023-11-27 12:24:22 +00:00
c41a2d0f19
Merge branch 'ent-11633-cambiar-ubicacion-del-boton-create-modules-en-wizards' into 'develop'
...
Ent 11633 cambiar ubicacion del boton create modules en wizards
See merge request artica/pandorafms!6436
2023-11-27 11:59:26 +00:00
f46e17f84d
Merge branch 'develop' into ent-12138-eliminar-agent-access-graph
2023-11-27 11:51:35 +01:00
b0125d943e
#12138 Resolve conflict
2023-11-27 11:51:00 +01:00
47a0c8e956
Merge branch 'ent-11442-consejos-de-bienvenida-tienen-controles-confusos' into 'develop'
...
Ent 11442 consejos de bienvenida tienen controles confusos
See merge request artica/pandorafms!6414
2023-11-27 10:47:18 +00:00
a4cd6d7fe1
#12138 Resolve conflict
2023-11-27 11:43:24 +01:00
ad8e3ac44f
Merge branch 'ent-11436-envio-de-correo-electronico-con-advertencia-a-pesar-de-ya-haber-cambiado-la-configuracion' into 'develop'
...
Ent 11436 envio de correo electronico con advertencia a pesar de ya haber cambiado la configuracion
See merge request artica/pandorafms!6464
2023-11-27 10:40:19 +00:00
092c14fdf4
Merge branch 'ent-11854-error-en-asignacion-de-grupo-de-agente-en-el-nuevo-asistente-de-bienvenida-pfms' into 'develop'
...
Ent 11854 error en asignacion de grupo de agente en el nuevo asistente de bienvenida pfms
See merge request artica/pandorafms!6391
2023-11-27 10:20:54 +00:00
262affeb74
Merge branch 'develop' into ent-12138-eliminar-agent-access-graph
2023-11-27 08:18:35 +01:00
d6bffbade1
implement demo data load
2023-11-20 16:52:49 +01:00
aa6aa08df3
#11026 autoupdate as string
2023-11-20 14:49:26 +01:00
miguel angel rasteu
Daniel Cebrian
Rafael Ameijeiras
Calvo
Daniel Rodriguez
daniel
Daniel Maya
Alejandro Campos
Diego Muñoz-Reja
Matias Didier
Jonathan
Enrique Martin