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

29175 Commits

Author SHA1 Message Date
Daniel Barbero Martin 9b79fb826d wip reports alert actions 2021-12-02 13:34:28 +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
Rafael Ameijeiras eed5753d9a merge 2021-12-02 11:26:33 +01:00
fbsanchez 11c18d9379 minor style changes 2021-12-02 11:10:18 +01: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
Daniel Maya ae0e4e2826 #8295 Added ajax call and spinner 2 2021-12-02 08:52:33 +01:00
Daniel Barbero Martin b781215b4e Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta 2021-12-02 08:33:02 +01:00
artica e693f7c3a2 Auto-updated build strings. 2021-12-02 01:00:18 +01:00
Daniel Barbero Martin a02c8a7988 wip reports alert actions 2021-12-01 15:15:45 +01:00
Jose Gonzalez 3238811f96 Fixed comments issues 2021-12-01 13:15:34 +01:00
Calvo a38503491a Wip: trending prediction modules 2021-12-01 11:34:11 +01:00
alejandro.campos@artica.es da22381044 fixed filter loaded from event graph on agent view 2021-12-01 11:13:28 +01:00
Daniel Barbero Martin e3d6d52c14 Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta 2021-12-01 08:15:43 +01:00
artica b63a33026b Auto-updated build strings. 2021-12-01 01:00:20 +01:00
Daniel Maya cacaaa89ae #8295 Added ajax call and spinner 2021-11-30 15:56:40 +01:00
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