17340 Commits

Author SHA1 Message Date
vgilc
4abf3f3b2e Merge branch '1976-Informe-de-log-dev' into 'develop'
Fixed sources in log report

See merge request artica/pandorafms!1508
2018-06-04 10:17:17 +02:00
vgilc
0008e0183b Merge branch 'ent-2247-busqueda-libre-en-vista-de-eventos-ext-5725' into 'develop'
Fixed free search in events view

See merge request artica/pandorafms!1511
2018-06-04 10:15:29 +02:00
vgilc
900f6ba609 Merge branch '2294-Requisitos-API-cluster-2' into 'develop'
Add cluster and API get functions - #2294

See merge request artica/pandorafms!1495
2018-06-04 10:13:28 +02:00
vgilc
b7dcd79eb3 Merge branch 'ent-2329-graficas-en-tiempo-real-con-modulos-SNMP-fallo-en-algunos-casos' into 'develop'
Fixed problems with strange names on SNMP realtime graphs

See merge request artica/pandorafms!1509
2018-06-04 10:12:27 +02:00
vgilc
9ea0115043 Merge branch 'ent-2010-error-de-ACLs-en-custom-graphs-y-reports' into 'develop'
[ACL] Now only RM can delete custom graphs

See merge request artica/pandorafms!1341
2018-06-04 10:10:56 +02:00
vgilc
b2eada198a Merge branch 'ent-2142-la-vista-de-grupos-del-nodo-usando-la-cache-esta-mal' into 'develop'
Ent 2142 la vista de grupos del nodo usando la cache esta mal

See merge request artica/pandorafms!1512
2018-06-04 10:00:53 +02:00
vgilc
0943540b05 Merge branch '2316-5594-fallo-redireccion.linked-visual-consoles-desde-Metaconsola' into 'develop'
Fixed static graph links to another visual console in meta

See merge request artica/pandorafms!1507
2018-06-04 09:59:51 +02:00
artica
77ccbe46a9 Auto-updated build strings. 2018-06-04 00:01:20 +02:00
artica
8138c2f8ae Auto-updated build strings. 2018-06-03 00:01:19 +02:00
artica
57ef534909 Auto-updated build strings. 2018-06-02 00:01:26 +02:00
fermin831
a55b829aa1 Fixed a PHP warning 2018-06-01 12:36:34 +02:00
fermin831
f0aacc4c33 Secondary groups are implemented in group view cache 2018-06-01 12:25:20 +02:00
fermin831
5c57ee34a7 Fixed group view on metaconsole (typo) 2018-06-01 12:23:25 +02:00
fermin831
0757d2ed56 Fixed cached group view in node 2018-06-01 12:19:34 +02:00
artica
ec050ba606 Auto-updated build strings. 2018-06-01 00:01:21 +02:00
fermin831
6bd672fd38 Fixed free search in events view 2018-05-31 20:32:04 +02:00
fermin831
ad4b38d510 Fixed problems with strange agent name on SNMP realtime graphs 2018-05-31 18:02:50 +02:00
fermin831
552f2ce14c Fixed problems with strange names on SNMP realtime graphs 2018-05-31 18:00:44 +02:00
danielmaya
04f117523b Fixed sources in log report 2018-05-31 17:33:51 +02:00
fermin831
0b0fe5ea6c Fixed static graph links to another visual console in meta 2018-05-31 17:14:35 +02:00
fermin831
836cce115d Fixed ACL in custom graphs 2018-05-31 15:29:31 +02:00
artica
e1cba85c6e Auto-updated build strings. 2018-05-31 00:01:21 +02:00
vgilc
569f469fa1 Merge branch 'go-to-mr-16' into 'develop'
Changed MR to 16 and current_package_enterprise to 723 for new and migrated installations

See merge request artica/pandorafms!1506
2018-05-30 16:34:10 +02:00
fermin831
f1807246a1 Changed MR to 16 and current_package_enterprise to 723 for new and migrated installations 2018-05-30 15:49:59 +02:00
fermin831
3155fecbfe Fixed ACL in reports created by another user in bit RM 2018-05-30 15:09:47 +02:00
fermin831
061df6495c Merge branch 'develop' into ent-2010-error-de-ACLs-en-custom-graphs-y-reports 2018-05-30 12:14:35 +02:00
vgilc
b54907aa2a Merge branch '2106-intracom-rebranding-3' into 'develop'
[Rebranding] Remove delete environment vars and fixed pandora_db redefinitions

See merge request artica/pandorafms!1505
2018-05-30 11:22:02 +02:00
fermin831
5c6e22c9b6 [Rebranding] Remove delete environment vars and fixed pandora_db redefinitions 2018-05-30 11:08:48 +02:00
artica
7147667d8c Auto-updated build strings. 2018-05-30 00:01:21 +02:00
vgilc
cab294e1e9 Merge branch '2106-intracom-rebranding-2' into 'develop'
2106 intracom rebranding 2

See merge request artica/pandorafms!1504
2018-05-29 17:39:47 +02:00
fermin831
0a2c744ef0 [Rebranding] Modified daemon to load environment vars 2018-05-29 17:32:24 +02:00
fermin831
aa6d931331 [Rebranding] Modified server source events by generic monitoring_event 2018-05-29 17:10:05 +02:00
fermin831
53cbc4ebde [Rebranding] Fixed missing include in pandora_db 2018-05-29 16:50:30 +02:00
fermin831
0acaf2312d [Rebranding] Mobile console head title 2018-05-29 13:26:47 +02:00
fermin831
1391f8cc11 [Rebranding] Fixed get header logo on metaconsole 2018-05-29 12:45:08 +02:00
artica
aa1e7ff4d2 Auto-updated build strings. 2018-05-29 00:01:28 +02:00
artica
01cce15955 Updated version and build strings. 2018-05-28 13:20:38 +02:00
vgilc
8cb5dea3d9 Merge branch '194-async-recovery' into 'develop'
I fixed the bug about async_recovery.

Closes #194

See merge request artica/pandorafms!1493
2018-05-28 12:50:28 +02:00
vgilc
a2941864a1 Merge branch '2106-intracom-rebranding' into 'develop'
2106 intracom rebranding

See merge request artica/pandorafms!1473
2018-05-28 12:49:51 +02:00
fermin831
88e060893a Merge branch 'develop' into 2106-intracom-rebranding
Conflicts resolved:
	pandora_console/operation/events/events_rss.php
2018-05-28 12:12:16 +02:00
vgilc
ba7292d292 Merge branch '2270-vulnerabilidad' into 'develop'
Added check_login to plugin registration

See merge request artica/pandorafms!1500
2018-05-28 11:49:15 +02:00
fbsanchez
2f8cdb5ea5 Added check_login to plugin registration 2018-05-28 11:31:09 +02:00
artica
2e4b320861 Auto-updated build strings. 2018-05-28 00:01:21 +02:00
artica
9ff98af9a5 Auto-updated build strings. 2018-05-27 00:01:26 +02:00
artica
edd38ac9c8 Auto-updated build strings. 2018-05-26 00:01:24 +02:00
fermin831
7afc617e62 [Rebranding] Implemented server rebranding through environment vars 2018-05-25 12:39:30 +02:00
fermin831
a54c074b11 [Rebranding] Added hide help on node 2018-05-25 10:29:40 +02:00
artica
643a07a163 Auto-updated build strings. 2018-05-25 00:01:22 +02:00
fermin831
6675597b62 [Rebranding] Minor fix 2018-05-24 18:35:20 +02:00
fermin831
8eb44762b2 [Rebranding] Added custom favicon and white background to meta 2018-05-24 18:33:45 +02:00