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

29091 Commits

Author SHA1 Message Date
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
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
Daniel Rodriguez adb538dd71 Merge branch 'ent-8073-No-esta-funcionando-correctamente-el-install-php-cuando-hace-los-ultimos-grants' into 'develop' 
minor fix

See merge request artica/pandorafms!4547
 2021-11-26 08:54:31 +00:00
Daniel Rodriguez 8fac24a469 Merge branch 'ent-8277-12706-Lista-de-alertas-no-filtra-correctamente' into 'develop' 
Ent 8277 12706 lista de alertas no filtra correctamente

See merge request artica/pandorafms!4539
 2021-11-26 07:58:38 +00:00
Daniel Rodriguez 67f85f92e2 Merge branch 'ent-8251-fallo-a-la-hora-de-guardar-ip-de-agente' into 'develop' 
Fix delete agent secondary ip bug

See merge request artica/pandorafms!4551
 2021-11-26 07:57:40 +00:00
Daniel Barbero Martin 9b62aa11da Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta 2021-11-26 08:16:46 +01:00
artica b1a55ad102 Auto-updated build strings. 2021-11-26 01:00:21 +01:00
Daniel Barbero Martin dae6182ef0 wip reports alert actions 2021-11-25 17:28:00 +01:00
Daniel Maya 2894d23e40 #7316 Fixed config_url 2021-11-25 16:15:44 +01:00
alejandro.campos@artica.es d94ed13f76 minor fixes 2021-11-25 15:03:46 +01:00
alejandro.campos@artica.es 6469f8053d minor fixes 2021-11-25 15:00:57 +01:00
Jose Gonzalez b151b3996d Fixed issue with events 2021-11-25 13:52:53 +01:00
Ramon Novoa 5bf83bcc81 Add support for percentage module status thresholds. 2021-11-25 12:58:21 +01:00
Daniel Rodriguez 05e61492c0 Merge branch 'ent-8228-Se-puede-crear/editar/borrar-un-usuario-desde-CLI-en-nodo-centralizado' into 'develop' 
Ent 8228 se puede crear/editar/borrar un usuario desde cli en nodo centralizado

See merge request artica/pandorafms!4544
 2021-11-25 10:52:58 +00:00
Daniel Rodriguez f66d6e7f9c Merge branch 'ent-8224-Se-puede-crear/editar/borrar-un-grupo-desde-el-CLI-en-nodo-centralizado' into 'develop' 
Ent 8224 se puede crear/editar/borrar un grupo desde el cli en nodo centralizado

See merge request artica/pandorafms!4542
 2021-11-25 10:52:08 +00:00
Daniel Barbero Martin f7233604fe Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta 2021-11-25 08:19:35 +01:00
Daniel Barbero Martin 8746db24c9 demo 2021-11-25 08:19:05 +01:00
artica 1f428a25ad Auto-updated build strings. 2021-11-25 01:00:20 +01:00
fbsanchez ba8087f49b ncm2 with schedules 2021-11-24 22:01:21 +01:00