tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
28,691 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

28691 Commits

Author SHA1 Message Date
alejandro.campos@artica.es 49d9271b4e fixed missing name and current value in snmp interface wizard when using satellite 2021-11-11 15:25:44 +01:00
alejandro.campos@artica.es 6b724b7747 fixed missing name and current value in snmp interface wizard when using satellite 2021-11-11 15:20:21 +01:00
artica 9c290d917e Auto-updated build strings. 2021-11-05 01:00:12 +01:00
José González 97da9cfc49 Merge branch 'revert-9a0ea482' into 'develop' 
Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'"

See merge request artica/pandorafms!4519
 2021-11-04 15:43:28 +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
José González 9a0ea482eb Merge branch 'ent-7662-rebranding-meta' into 'develop' 
Added rebranding features

Closes pandora_enterprise#7662

See merge request artica/pandorafms!4302
 2021-11-04 15:27:57 +00:00
Jose Gonzalez c0abe5edb9 Fix merge 2021-11-04 16:00:05 +01:00
Jose Gonzalez 932d42e8da Fixed colours 2021-11-04 15:44:40 +01:00
artica 4ebb817d90 Auto-updated build strings. 2021-11-04 01:00:54 +01:00
vgilc 89e1f4ed92 Merge branch 'ent-8218-Actualizar-cadenas-español' into 'develop' 
Ent 8218 actualizar cadenas español

See merge request artica/pandorafms!4518
 2021-11-03 13:04:12 +00:00
Daniel Maya 7b2cd564c4 #8218 Added mo and po fr 2021-11-03 13:33:29 +01:00
vgilc b18c9dceac Merge branch 'ent-8223-Subir-version-y-mr' into 'develop' 
updated mr and version

See merge request artica/pandorafms!4517
 2021-11-03 10:10:09 +00:00
Daniel Barbero Martin c73ee2d113 updated mr and version 2021-11-03 11:04:19 +01:00
Daniel Rodriguez 56ae68a034 Merge branch 'ent-7951-Bloqueo-auto-creacion-usuarios-desde-nodo-en-entornos-centralizado' into 'develop' 
Ent 7951 bloqueo auto creacion usuarios desde nodo en entornos centralizado

See merge request artica/pandorafms!4487
 2021-11-03 09:34:49 +00:00
Daniel Maya 3ccd97f50f #8218 deleted mo and po 2021-11-03 09:18:58 +01:00
artica 0be9abcdca Auto-updated build strings. 2021-11-03 01:00:21 +01:00
Daniel Maya 4f6fa654b8 #8218 Added mo and po 2 2021-11-02 17:10:53 +01:00
Daniel Rodriguez 8163f820a9 Merge branch 'ent-8218-Actualizar-cadenas-español' into 'develop' 
Ent 8218 actualizar cadenas español

See merge request artica/pandorafms!4514
 2021-11-02 14:36:24 +00:00
Daniel Rodriguez 845275b947 Merge branch 'ent-8209-Problemas-Odometer-Consola-Visual' into 'develop' 
Ent 8209 problemas odometer consola visual

See merge request artica/pandorafms!4512
 2021-11-02 14:31:56 +00:00
Daniel Maya e4ab91df54 #8218 Added index.pot 2021-11-02 12:59:08 +01:00
Daniel Maya fd03aff74b #8218 Added mo and po 2021-11-02 12:11:07 +01:00
artica 23566c9ef4 Auto-updated build strings. 2021-11-02 01:00:18 +01:00
artica f1734e56c3 Auto-updated build strings. 2021-11-01 01:00:17 +01:00
artica 7b9234f392 Auto-updated build strings. 2021-10-31 01:00:19 +02:00
artica 6c6c375702 Auto-updated build strings. 2021-10-30 01:00:24 +02:00
alejandro.campos@artica.es b4c21cfdca fixed several bugs in AD authentication in metaconsole 2021-10-29 16:12:23 +02:00
Daniel Maya 9792e64ed5 #8209 Fixed odometer 2021-10-29 14:35:57 +02:00
Daniel Rodriguez 9b6f829171 Merge branch 'ent-8183-Bug-en-widget-Tree-view-Dashboard-metaconsola' into 'develop' 
dashboard widget tree fix in metaconsole only groups type

See merge request artica/pandorafms!4511
 2021-10-29 11:07:42 +00:00
Daniel Rodriguez 3883c99804 Merge branch 'ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card' into 'develop' 
CorrelationServer

See merge request artica/pandorafms!4377
 2021-10-29 10:07:25 +00:00
Daniel Barbero Martin 9d776feb41 dashboard widget tree fix in metaconsole only groups type 2021-10-29 11:50:41 +02:00
artica c903942c7b Auto-updated build strings. 2021-10-29 01:00:21 +02:00
fbsanchez bf0064d486 Correlated alerts are not being linked to modules 2021-10-28 17:21:02 +02:00
fbsanchez 701c384c54 More accurated message when recovering event alerts 2021-10-28 13:01:18 +02:00
Daniel Rodriguez dfede4de78 Merge branch 'ent-8181-umc-traer-cambios' into 'develop' 
UM replicated

See merge request artica/pandorafms!4506
 2021-10-28 09:41:41 +00:00
artica 7cd429d9f8 Auto-updated build strings. 2021-10-28 01:00:22 +02:00
fbsanchez 2d09e5bfb7 Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card 2021-10-27 22:59:19 +02:00
fbsanchez 77bee9f3ca UM replicated 2021-10-27 22:28:37 +02:00
Daniel Rodriguez 0ec2bf30ce Merge branch 'ent-7972-funcionalidad-historico-de-alertas-lanzadas' into 'develop' 
Fix SQL errors in action queries.

See merge request artica/pandorafms!4502
 2021-10-27 15:45:33 +00:00
artica 945392b615 Auto-updated build strings. 2021-10-27 01:00:56 +02:00
Ramon Novoa cd3e20fefe Fix action information for SNMP alert events. 2021-10-26 17:40:03 +02:00
Ramon Novoa 35aa6b5258 Fix SQL errors in action queries. 2021-10-26 15:07:42 +02:00
fbsanchez a5bf72cca0 Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/include/constants.php
	pandora_server/lib/PandoraFMS/Tools.pm
 2021-10-26 14:21:40 +02:00
Ramon Novoa 356e1f9f2b Fix SQL errors in action queries. 2021-10-26 13:24:23 +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
artica 24404d5078 Auto-updated build strings. 2021-10-26 01:01:06 +02:00
Daniel Rodriguez 3436d80d09 Merge branch 'ent-8132-Bug-in-supernet-tree-view-IPAM' into 'develop' 
fixed ipam supernet tree view when there is no data show

See merge request artica/pandorafms!4499
 2021-10-25 15:15:13 +00:00
fbsanchez 05a2db88a3 menu fix 2021-10-25 17:01:26 +02:00
fbsanchez dabd7f53fe minor fixes 2021-10-25 14:05:11 +02: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