tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-21 01:38:45 +02:00
Code Issues Packages Projects Releases Wiki Activity
37,799 Commits 34 Branches 30 Tags
Commit Graph

1632 Commits

Author SHA1 Message Date
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
alejandro.campos@artica.es
812e47603e some changes in audit view 2023-12-11 18:05:58 +01:00
Rafael Ameijeiras
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
Rafael Ameijeiras
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
Rafael Ameijeiras
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
Rafael Ameijeiras
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
Enrique Martin
c8e7e1e375 Added text to welcome wizard 2023-12-11 12:08:50 +01:00
Jorge Rincon
8d4e3e78a3 #12579 fixed icons as buttons in action on satellite server agents 2023-12-07 16:00:42 +01:00
alejandro.campos@artica.es
2eae64407d get data in file count from module 2023-12-07 14:17:42 +01:00
alejandro.campos@artica.es
3d63544939 get data in file count from module 2023-12-07 14:14:12 +01:00
Alejandro Campos
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
alejandro.campos@artica.es
457f8e9448 some changes in discovery 2023-12-05 16:07:14 +01:00
alejandro.campos@artica.es
60137eb300 changes in discovery extensions 2023-12-05 11:32:19 +01:00
daniel
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
alejandro.campos@artica.es
75ddb3b934 minor changes in demo data functionality 2023-12-04 11:37:12 +01:00
miguel angel rasteu
b89f182e19 #12213 Resolve conflicts 2023-12-01 10:31:50 +01:00
Diego Muñoz-Reja
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
alejandro.campos@artica.es
ca17eef68a implement load demo data 2023-11-29 18:09:32 +01:00
Diego Muñoz-Reja
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
daniel
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
Matias Didier
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
Rafael Ameijeiras
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
Matias Didier
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
Matias Didier
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
Rafael Ameijeiras
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
miguel angel rasteu
f46e17f84d Merge branch 'develop' into ent-12138-eliminar-agent-access-graph 2023-11-27 11:51:35 +01:00
miguel angel rasteu
b0125d943e #12138 Resolve conflict 2023-11-27 11:51:00 +01:00
Rafael Ameijeiras
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
miguel angel rasteu
a4cd6d7fe1 #12138 Resolve conflict 2023-11-27 11:43:24 +01:00
Rafael Ameijeiras
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
Matias Didier
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
miguel angel rasteu
262affeb74 Merge branch 'develop' into ent-12138-eliminar-agent-access-graph 2023-11-27 08:18:35 +01:00
alejandro.campos@artica.es
d6bffbade1 implement demo data load 2023-11-20 16:52:49 +01:00
Jonathan
aa6aa08df3 #11026 autoupdate as string 2023-11-20 14:49:26 +01:00
Jonathan
d1b2bf1ee2 Merge branch 'develop' into ent-11026-si-el-token-automatically-check-for-updates-esta-desactivado-no-debe-mostrar-aviso-para 2023-11-20 14:33:49 +01:00
miguel angel rasteu
89be9af98f #11442 Fix conflicts 2023-11-17 12:33:33 +01:00
Jorge Rincon
78a5a3bfe8 #12168 Hierarchy is added to the title of services 2023-11-14 17:12:22 +01:00
Jorge Rincon
04649dee00 #12168 Fixed sql bringing main services 2023-11-13 13:41:47 +01:00
Daniel Maya
ad90fb74b2 #12390 Fixed group 2023-11-13 10:42:25 +01:00
miguel angel rasteu
4f60c62626 #12132 Fix conflict 2023-11-08 16:31:01 +01:00
daniel
c676e7b030 Fix add alerts pandora_enterprise#12362 2023-11-03 12:49:19 +01:00
Daniel Cebrian
34c66981be #12357 fixed pagination datatable 2023-10-31 09:16:42 +01:00
alejandro.campos@artica.es
1fd45fb95f implement demo data feature 2023-10-26 19:05:07 +02:00
daniel
868700f9f1 add sliced mode simple graph reports and CV pandora_enterprise#9640 2023-10-25 15:55:54 +02:00
Daniel Rodriguez
1f8554e8d1 Merge branch 'ent-11914-editor-de-alertas-de-logs' into 'develop' 
Ent 11914 editor de alertas de logs

See merge request artica/pandorafms!6505
 2023-10-23 12:34:32 +00:00