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

2176 Commits

Author SHA1 Message Date
Daniel Rodriguez
edd76aa959 Merge branch 'ent-8591-envio-de-feedback-no-funciona' into 'develop' 
Fix error/success from send feedback dialog

See merge request artica/pandorafms!4713
 2022-03-10 13:53:40 +00:00
Daniel Rodriguez
09ba16c593 Merge branch 'ent-5886-Vista-para-mostrar-modulos-agentes-en-paradas-planificadas' into 'develop' 
clean file planned_downtime pandora_enterprise#5886

See merge request artica/pandorafms!4688
 2022-03-09 12:48:47 +00:00
Daniel Barbero Martin
640d93045f Merge remote-tracking branch 'origin/develop' into ent-2152-Operaciones-masivas-de-grupos-secundarios 
Conflicts:
	pandora_console/godmode/massive/massive_edit_agents.php
 2022-03-09 09:28:08 +01:00
Calvo
433b4dda62 Fix select2 search on extended events dialog 2022-03-03 18:37:33 +01:00
Calvo
3e6a6445b1 Fix error/success from send feedback dialog 2022-02-22 17:29:17 +01:00
Calvo
b67683adff Fix agent modules selector on meta for dashboards 2022-02-21 16:38:09 +01:00
Calvo
8d293c4777 Merge remote-tracking branch 'origin/develop' into ent-8532-widget-agent-modulos-no-muestra-modulos 2022-02-18 12:26:13 +01:00
Calvo
a642f88364 Multiselect filtered revomed all/common modules select and added switch 2022-02-16 12:26:22 +01:00
Calvo
9d4eda381b Merge remote-tracking branch 'origin/develop' into ent-8532-widget-agent-modulos-no-muestra-modulos 2022-02-15 17:44:34 +01:00
Calvo
e2b3cd2dab Visual changes on dashboard agent/modules configuration menu 2022-02-15 17:36:00 +01:00
fbsanchez
1da5534484 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 
Conflicts:
	.gitlab-ci.yml
	pandora_console/pandoradb.sql
 2022-02-15 17:32:10 +01:00
fbsanchez
7c11a01b85 Merge remote-tracking branch 'origin/develop' into ent-8161-deshabilitar-reglas-de-autoconfiguracion-en-nodos-a-demanda 2022-02-15 14:32:50 +01:00
Daniel Rodriguez
6abd7212e6 Merge branch 'ent-7573-Problemas-integracion-Module-Library-vs-Wordpress' into 'develop' 
Ent 7573 problemas integracion module library vs wordpress

Closes pandora_enterprise#7573

See merge request artica/pandorafms!4634
 2022-02-15 10:19:49 +00:00
fbsanchez
9ba2eb0c74 Merge remote-tracking branch 'origin/develop' into ent-8161-deshabilitar-reglas-de-autoconfiguracion-en-nodos-a-demanda 
Conflicts:
	pandora_console/extras/mr/52.sql
	pandora_console/pandoradb.sql
 2022-02-10 18:52:51 +01:00
Daniel Barbero Martin
b56c9e6529 new modal planned_downtime resume agents/modules pandora_enterprise#5886 2022-02-09 14:57:36 +01:00
Jose Gonzalez
3d4146c926 Minor fix 2022-02-08 17:54:37 +01:00
fbsanchez
6bb754d5d2 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 
Conflicts:
	pandora_console/pandoradb.sql
 2022-02-08 13:02:22 +01:00
fbsanchez
331f8e8906 php8 incompatibility fixes 2022-02-07 13:48:25 +01:00
Daniel Barbero Martin
0e0e737283 calendar not editable pandora_enterprise#3943 2022-02-07 13:07:48 +01:00
Daniel Barbero Martin
dca70fa8ec Merge remote-tracking branch 'origin/develop' into ent-3943-Plantillas-de-alerta-con-varios-horarios 2022-02-07 08:04:36 +01:00
Daniel Barbero Martin
6f15d26af2 minor fix pandora_enterprise#3943 2022-02-04 09:48:10 +01:00
Daniel Barbero Martin
a359fd6828 bulk operation edit agents add secundary groups pandora_enterprise#2152 2022-02-03 12:56:36 +01:00
Daniel Barbero Martin
c971ed6dd5 alert template schedule pandora_enterprise#3943 2022-02-02 13:18:16 +01:00
Daniel Barbero Martin
3d951749f5 alert template schedule pandora_enterprise#3943 2022-02-02 13:03:52 +01:00
Daniel Rodriguez
110052a21f Merge branch 'ent-8428-12919-visualizacion-agentes-en-operaciones-masivas-de-modulos' into 'develop' 
Ent 8428 12919 visualizacion agentes en operaciones masivas de modulos

See merge request artica/pandorafms!4666
 2022-02-02 09:37:15 +00:00
Daniel Rodriguez
1ff1e2b3fd Merge branch 'ent-8507-13049-Bug-al-crear-modulo-de-prediccion' into 'develop' 
fix in prediction modules creation

See merge request artica/pandorafms!4665
 2022-02-02 09:36:45 +00:00
Daniel Barbero Martin
5060d0b8f7 alert template schedule pandora_enterprise#3943 2022-02-02 10:09:31 +01:00
Daniel Barbero Martin
b62566af49 alert template schedule pandora_enterprise#3943 2022-02-01 16:50:53 +01:00
Daniel Barbero Martin
0a4d6cfd31 Merge remote-tracking branch 'origin/develop' into ent-3943-Plantillas-de-alerta-con-varios-horarios 
Conflicts:
	pandora_console/include/styles/pandora.css
 2022-02-01 11:36:33 +01:00
Daniel Rodriguez
d21d65a7ac Merge branch 'ent-8206-busqueda-de-modulos-en-graficas-personalizadas' into 'develop' 
Added select filtered modulo to custom graphs conf menu

See merge request artica/pandorafms!4647
 2022-02-01 09:38:12 +00:00
Daniel Barbero Martin
15ada66942 alert template schedule pandora_enterprise#3943 2022-01-31 16:50:48 +01:00
alejandro.campos@artica.es
2b6a9f0277 show agent and module name tip 2022-01-31 15:43:56 +01:00
Daniel Barbero Martin
c02abbc508 alert template schedule pandora_enterprise#3943 2022-01-31 13:45:44 +01:00
alejandro.campos@artica.es
b9c78bbfb1 show agent and module name tip 2022-01-31 13:18:26 +01:00
alejandro.campos@artica.es
e56512246b fix in prediction modules creation 2022-01-31 11:35:53 +01:00
Daniel Barbero Martin
392a9223e8 alert template schedule pandora_enterprise#3943 2022-01-28 14:06:31 +01:00
alejandro.campos@artica.es
d210390a3d truncate texts in module massive operations 2022-01-27 17:30:20 +01:00
Daniel Barbero Martin
a4f092f0a0 alert template schedule pandora_enterprise#3943 2022-01-27 17:02:24 +01:00
Daniel Barbero Martin
9f01029520 Merge remote-tracking branch 'origin/develop' into ent-8290-Crear-nueva-seccion-Operaciones-Masivas-borrado-agentes-en-Metaconsola 2022-01-26 08:12:20 +01:00
Daniel Barbero Martin
74f73e2004 Merge remote-tracking branch 'origin/develop' into ent-3943-Plantillas-de-alerta-con-varios-horarios 
Conflicts:
	pandora_console/include/styles/pandora.css
 2022-01-26 08:10:40 +01:00
Calvo
f383586dcc WIP:Added searchbar to select multiple modules 2022-01-25 20:15:40 +01:00
vgilc
4b85e93490 Merge branch 'ent-8222-Nueva-grafica-desde-la-vista-de-modulos-Histograma' into 'develop' 
Ent 8222 nueva grafica desde la vista de modulos histograma

See merge request artica/pandorafms!4637
 2022-01-25 10:28:18 +00:00
vgilc
ea122aae3e Merge branch 'ent-8387-Bug-visual-al-intentar-linkar-a-un-agente-sin-permisos' into 'develop' 
Ent 8387 bug visual al intentar linkar a un agente sin permisos

See merge request artica/pandorafms!4632
 2022-01-25 10:22:42 +00:00
Daniel Barbero Martin
2519335637 Merge remote-tracking branch 'origin/develop' into ent-3943-Plantillas-de-alerta-con-varios-horarios 
Conflicts:
	pandora_console/include/styles/pandora.css
 2022-01-25 10:40:37 +01:00
Daniel Barbero Martin
9a799a838d Merge remote-tracking branch 'origin/develop' into ent-8290-Crear-nueva-seccion-Operaciones-Masivas-borrado-agentes-en-Metaconsola 2022-01-25 10:34:43 +01:00
vgilc
6749090cc6 Merge branch 'ent-8409-bug-widget-agent-module-view' into 'develop' 
Fix issue with modules

Closes pandora_enterprise#8409

See merge request artica/pandorafms!4616
 2022-01-25 09:28:12 +00:00
Daniel Barbero Martin
2fccdd12cb bulk operations agents in meta #8290 2022-01-24 12:19:09 +01:00
Daniel Barbero Martin
7c2000c34d bulk operations agents in meta #8290 2022-01-21 11:49:30 +01:00
Daniel Barbero Martin
87bfd08bb9 bulk operations agents in meta #8290 2022-01-20 16:52:14 +01:00
Daniel Barbero Martin
6be6b1a95d add new macros #3763 2022-01-19 12:18:23 +01:00