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 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
Daniel Rodriguez
d094987eda Merge branch 'ent-8063-recursion-y-filtro-en-operaciones-masivas-de-modulos' into 'develop' 
Fix recursion and filter on modules massive operations

See merge request artica/pandorafms!4477
 2021-11-15 11:29:33 +00:00
Daniel Rodriguez
9b55ade1bb Merge branch 'ent-7997-fallo-visualizacion-vista-de-arbol-de-servicios' into 'develop' 
Fix services tree empty leaf visual bug

See merge request artica/pandorafms!4410
 2021-11-15 10:24:57 +00:00
José González
bdc4d0a8b1 Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 
This reverts merge request !4302
 2021-11-04 16:28:15 +01:00
Jose Gonzalez
c0abe5edb9 Fix merge 2021-11-04 16:00:05 +01:00
Daniel Barbero Martin
bd75912a0d wip special days alerts 2021-11-04 09:55:37 +01:00
Daniel Barbero Martin
1e976a8605 alerts special days wip 2021-11-03 10:59:00 +01:00
Daniel Barbero Martin
89680907fd wip special days 2021-10-29 13:45:18 +02:00
Daniel Barbero Martin
c2cce3990a special days template alerts 2021-10-28 17:30:03 +02:00
Daniel Rodriguez
e2ae42dd89 Merge branch 'ent-7060-gestion-basica-de-configuracion-de-equipos-de-red' into 'develop' 
NCM

See merge request artica/pandorafms!4434
 2021-10-26 08:21:01 +00:00
alejandro.campos@artica.es
aa24bf545c fixed ipam supernet tree view when there is no data show 2021-10-25 12:14:21 +02:00
fbsanchez
5ae3bbc4fe Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red 2021-10-25 10:28:31 +02:00
Calvo
f1f984614f Unify search criteria case insensitive 2021-10-22 12:02:31 +02:00
fbsanchez
98c43ea1e7 WIP NCM 2021-10-19 21:11:09 +02:00
Calvo
7daf138ef5 Fix recursion and filter on modules massive operations 2021-10-18 15:47:22 +02:00
Jose Gonzalez
304a4b5687 Fix size of event detail tabs 2021-10-15 09:36:22 +02:00
Daniel Rodriguez
2118f44a7a Merge branch 'ent-7964-nug-visual-en-tree-view' into 'develop' 
Added title attr to module names in treeview

See merge request artica/pandorafms!4412
 2021-10-07 08:42:01 +00:00
Jose Gonzalez
a70d48514e Fix Barivion name in license and readme 2021-10-06 13:33:25 +02:00
Calvo
50dbeb03ce Fix entities on modules with large name treeview 2021-10-06 10:41:55 +02:00
Daniel Rodriguez
fb7e443138 Merge branch 'ent-7938-bug-visual-en-item-odometro-cv' into 'develop' 
Ent 7938 bug visual en item odometro cv

See merge request artica/pandorafms!4386
 2021-10-05 09:20:47 +00:00
Daniel Rodriguez
a794f30141 Merge branch 'ent-8060-bug-modal-networkmaps' into 'develop' 
Fixed issue with node actions

Closes pandora_enterprise#8060

See merge request artica/pandorafms!4438
 2021-10-05 09:19:26 +00:00
marcos
7418719861 resolved merge conflict 2021-10-04 12:27:57 +02:00
marcos
30bf0ee163 Merge remote-tracking branch 'origin/master' into ent-7938-bug-visual-en-item-odometro-cv 2021-10-04 11:56:08 +02:00