Commit Graph

29160 Commits

Author SHA1 Message Date
Daniel Rodriguez 345cbcf5ba Merge branch 'ent-8123-Autenticacion-remota-en-entornos-centralizados' into 'develop'
fix setup centraliced active directory

See merge request artica/pandorafms!4540
2021-11-30 14:44:48 +00:00
Daniel Barbero Martin 6d9b3d209c Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta 2021-11-30 14:45:07 +01:00
Daniel Rodriguez ef310cce4c Merge branch 'ent-fix-special-multibyte-characters-treatment' into 'develop'
Fixed special multibyte characters treatment.

See merge request artica/pandorafms!4524
2021-11-30 13:34:35 +00:00
Daniel Rodriguez e7e8920783 Merge branch 'ent-8307-Supernet-map-Desplegar-elementos' into 'develop'
Ent 8307 supernet map desplegar elementos

See merge request artica/pandorafms!4559
2021-11-30 13:34:04 +00:00
Daniel Rodriguez 84f6d78ee4 Merge branch 'ent-8310-IPAM-Campo-Ubicacion' into 'develop'
Ent 8310 ipam campo ubicacion

See merge request artica/pandorafms!4560
2021-11-30 13:32:36 +00:00
Daniel Barbero Martin 347769299b outocreate remote user centralized node 2021-11-30 14:23:19 +01:00
Daniel Barbero Martin 3262d8ea35 Merge remote-tracking branch 'origin/develop' into ent-8123-Autenticacion-remota-en-entornos-centralizados 2021-11-30 14:17:59 +01:00
Daniel Barbero Martin 40d801a947 Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta 2021-11-30 14:16:19 +01:00
alejandro.campos@artica.es bca8f6f1c0 minor fix 2021-11-30 14:08:12 +01:00
Daniel Barbero Martin ef84b696b3 wip reports alert actions 2021-11-30 13:34:43 +01:00
Daniel Barbero Martin 40fc8c7308 wip reports alert actions 2021-11-30 13:07:37 +01:00
Calvo 136ad128f9 Added help tip to percentage token 2021-11-30 12:12:24 +01:00
Jose Gonzalez 64e08d7124 Fixed grouped comments with id_agent 2021-11-30 10:50:40 +01:00
Daniel Rodriguez 23becba397 Merge branch 'ent-8314-no-sale-actualizacion-parche-en-update-manager-de-los-nodos' into 'develop'
allow online patches in decimal format

See merge request artica/pandorafms!4556
2021-11-30 09:21:07 +00:00
Daniel Maya 44446673e4 #8255 Fixed select2 2021-11-30 09:56:42 +01:00
artica 622d125b36 Auto-updated build strings. 2021-11-30 01:00:24 +01:00
Daniel Barbero Martin 33d9db657e wip reports alert actions 2021-11-29 20:45:35 +01:00
Daniel Barbero Martin e8bf86a789 wip reports alert actions 2021-11-29 17:55:09 +01:00
alejandro.campos@artica.es 8c8b5aee30 minor change 2021-11-29 16:34:32 +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
alejandro.campos@artica.es 29aacb57c1 Merge remote-tracking branch 'origin/develop' into ent-8310-IPAM-Campo-Ubicacion 2021-11-29 15:33:00 +01:00
fbsanchez 19643cd685 report for ncm simple 2021-11-29 15:26:19 +01:00
alejandro.campos@artica.es 73cde9ee48 db changes 2021-11-29 14:58:34 +01:00
Calvo 7d8a5b029e Changed radio buttons to select on prediction modules 2021-11-29 14:45:19 +01:00
Daniel Rodriguez 75699cb8fc Merge branch 'ent-7844-revision-acl-enterprise-parte-3-fallos-actuales' into 'develop'
Ent 7844 revision acl enterprise parte 3 fallos actuales

See merge request artica/pandorafms!4356
2021-11-29 11:36:52 +00: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
Calvo 4eccc2b612 Removed policies search in open gerneral search 2021-11-29 11:36:13 +01:00
fbsanchez 68c2400b9c fix 2021-11-29 10:32:54 +01:00
fbsanchez 5197d08aa3 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2
Conflicts:
	pandora_console/install.php
2021-11-29 09:54:55 +01:00
Daniel Barbero Martin 75354a97d9 Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta 2021-11-29 08:05:45 +01:00
artica 1bbcf965a8 Auto-updated build strings. 2021-11-29 01:00:15 +01:00
artica 7631585546 Auto-updated build strings. 2021-11-28 01:00:16 +01:00
artica 800faaf504 Auto-updated build strings. 2021-11-27 01:00:46 +01:00
fbsanchez 9c17625c77 ncm2 2021-11-26 18:11:34 +01:00
Daniel Barbero Martin 1d7c27c64d wip reports alert actions 2021-11-26 14:29:46 +01:00
Daniel Barbero Martin 81277246a5 wip reports alert actions 2021-11-26 14:10:21 +01:00
Daniel Barbero Martin 960c2de6c3 wip reports alert actions 2021-11-26 14:06:10 +01:00
Daniel Barbero Martin cb0039d7a7 wip reports alert actions 2021-11-26 13:52:15 +01:00
fbsanchez eba4a1b0db repoDisk patch (MC => Nodes) 2021-11-26 12:36:49 +00:00
Daniel Barbero Martin be5fe18762 wip reports alert actions 2021-11-26 13:23:46 +01:00
Ramon Novoa e8581710c8 Merge remote-tracking branch 'origin/ent-8303-formularios-en-modulos-para-nueva-funcionalidad-incremento-de-valor' into ent-1831-5173-nt-nueva-funcionalidad-en-los-templates-de-alertas-para-incremento-de-valor 2021-11-26 12:29:56 +01:00
Daniel Barbero Martin 0b04ba44f2 wip reports alert actions 2021-11-26 12:15:39 +01:00
Calvo 54755db59b Control inverse and percentege cannot be selected at same time 2021-11-26 11:55:38 +01:00
Jose Gonzalez 5eb4a869cc Fix issue with metaconsole comments 2021-11-26 11:51:27 +01:00
Daniel Rodriguez 2cca2e94b6 Merge branch 'ent-8306-Bug-al-editar-elemento-en-File-repository-manager' into 'develop'
Ent 8306 bug al editar elemento en file repository manager

See merge request artica/pandorafms!4555
2021-11-26 10:50:49 +00:00
Daniel Rodriguez 137b3b132f Merge branch 'ent-8296-12744-Problemas-Create-a-new-webserver-module' into 'develop'
Ent 8296 12744 problemas create a new webserver module

See merge request artica/pandorafms!4554
2021-11-26 10:49:03 +00:00
Daniel Barbero Martin 780d2bf87d wip reports alert actions 2021-11-26 11:43:57 +01:00
fbsanchez 951f29769b allow online patches in decimal format 2021-11-26 10:31:16 +01:00
Daniel Rodriguez a249ad43e8 Merge branch 'ent-8292-update-manager-dbpass-encriptada' into 'develop'
Fixed issue

Closes pandora_enterprise#8292

See merge request artica/pandorafms!4545
2021-11-26 09:20:56 +00:00