tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-27 20:58:53 +02:00
Code Issues Packages Projects Releases Wiki Activity
39,402 Commits 34 Branches 30 Tags
Commit Graph

2248 Commits

Author SHA1 Message Date
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
Daniel Barbero Martin
a0a74cf7bb add new chart histogram 2022-01-18 13:01:49 +01:00
Daniel Maya
b2fe6780ac Fixed links in networkmaps 2022-01-18 11:39:37 +01:00
Jose Gonzalez
7a88e2db29 WIP: Testing Wordpress with prewebs 2022-01-17 17:15:37 +01:00
Daniel Maya
626431f27c Added check on agents without acl 2022-01-14 09:49:26 +01:00
José González
f18e0693da Merge branch 'develop' into 'ent-8409-bug-widget-agent-module-view' 
# Resolve Conflicts:
#   pandora_console/include/javascript/pandora_dashboards.js
 2022-01-13 08:58:21 +00:00
Daniel Maya
ffc468fce8 Added message 2022-01-12 13:59:46 +01:00
Jose Gonzalez
9519e00992 Fix issues with select agents modules control 2022-01-11 16:06:58 +01:00
Jose Gonzalez
f072585d5a Clean undefined messages for tree view 2022-01-07 10:39:03 +01:00
Jose Gonzalez
8cdf1acd42 Fix issue with modules 2022-01-06 16:23:13 +01:00
Daniel Rodriguez
a89d3b2b25 Merge branch 'ent-8232-plugin-de-servidor-con-el-token-hide-habilitado' into 'develop' 
Ent 8232 plugin de servidor con el token hide habilitado

See merge request artica/pandorafms!4567
 2021-12-27 17:00:32 +00:00
Daniel Barbero Martin
a803b5fa90 WIP #3943 2021-12-17 13:38:53 +01:00
fbsanchez
f852df2f1c Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-12-14 11:03:04 +01:00
Daniel Rodriguez
c3f9ed1bf2 Merge branch 'ent-8042-agrupacion-eventos-no-funcionan-bien-comentarios' into 'develop' 
Added feature for read comments in grouped events

Closes pandora_enterprise#8042

See merge request artica/pandorafms!4467
 2021-12-07 16:51:07 +00:00
fbsanchez
3e7a81ea33 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-12-03 10:24:01 +01:00
Daniel Maya
6ead6b8a48 #8232 Fixed value in password 2021-12-03 09:22:39 +01:00
Daniel Rodriguez
69590afef6 Merge branch 'ent-1831-5173-nt-nueva-funcionalidad-en-los-templates-de-alertas-para-incremento-de-valor' into 'develop' 
Ent 1831 5173 nt nueva funcionalidad en los templates de alertas para incremento de valor

See merge request artica/pandorafms!4557
 2021-12-02 10:51:57 +00:00
fbsanchez
cad0c6cea6 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-12-02 10:43:30 +01:00
Jose Gonzalez
7918b883aa Set the last grouped comments to last events fired 2021-11-29 16:12:15 +01:00
Daniel Maya
c289f67395 #8307 Added contextmenu in supernet map 2021-11-29 15:54:45 +01:00
Daniel Rodriguez
198959f6cb Merge branch 'ent-7995-unificar-criterios-de-busqueda-que-no-sean-case-sensitive' into 'develop' 
Unify search criteria case insensitive

See merge request artica/pandorafms!4496
 2021-11-29 11:08:00 +00:00
fbsanchez
9c17625c77 ncm2 2021-11-26 18:11:34 +01:00
Calvo
5464a73a12 Merge remote-tracking branch 'origin/develop' into ent-8303-formularios-en-modulos-para-nueva-funcionalidad-incremento-de-valor 2021-11-24 13:28:36 +01:00
Calvo
4dd931f277 Modules percentage threshold form 2021-11-24 11:33:36 +01:00
fbsanchez
ce00d59f00 ncm2 2021-11-23 20:31:04 +01:00
fbsanchez
582cb9a082 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-11-19 10:51:46 +01:00
Daniel Barbero Martin
c52e11e91a Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-11-19 08:12:22 +01:00
fbsanchez
8346a233be NCM2 2021-11-18 19:49:57 +01:00
fbsanchez
75f4e86f9e Code highlight 2021-11-16 14:05:02 +01:00