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

6070 Commits

Author SHA1 Message Date
Daniel Rodriguez 16c35a000e Merge branch 'ent-8103-Metaconsole-vista-logs-auditoria' into 'develop' 
Updated audit logs view and added controller

Closes pandora_enterprise#8103

See merge request artica/pandorafms!4582
 2021-12-27 09:22:07 +00:00
Daniel Rodriguez f102460978 Merge branch 'ent-8131-items-sql-graph-no-se-ajustan-a-tamano-setup' into 'develop' 
Setted graph_image_height

Closes pandora_enterprise#8131

See merge request artica/pandorafms!4600
 2021-12-23 12:24:06 +00:00
Daniel Rodriguez f0562980f7 Merge branch 'ent-7925-Bugs-de-capas-en-mapas-GIS' into 'develop' 
Ent 7925 bugs de capas en mapas gis

See merge request artica/pandorafms!4579
 2021-12-23 12:23:07 +00:00
Daniel Rodriguez 7f78a5b514 Merge branch 'ent-8179-Mensaje-anti-hacking-al-intentar-eliminar-modulos' into 'develop' 
minor fix

See merge request artica/pandorafms!4562
 2021-12-23 12:16:54 +00:00
Daniel Rodriguez 31a90c4170 Merge branch 'ent-8255-Al-editar-una-acción-de-alerta-no-se-cargan-los-boxes-de-los-fields-creados-con-tags' into 'develop' 
Ent 8255 al editar una acción de alerta no se cargan los boxes de los fields creados con tags

See merge request artica/pandorafms!4561
 2021-12-23 11:59:58 +00:00
Daniel Rodriguez 04f06b13be Merge branch 'ent-8262-12695-Bug-en-paginación-de-accciones-de-alerta-META' into 'develop' 
Ent 8262 12695 bug en paginación de accciones de alerta meta

See merge request artica/pandorafms!4552
 2021-12-23 10:09:37 +00:00
Daniel Rodriguez b8a1602aaf Merge branch 'ent-8260-Bug-en-edición-de-acción-de-alerta-Create-Integria-IMS-ticket-metaconsola' into 'develop' 
Ent 8260 bug en edición de acción de alerta create integria ims ticket metaconsola

See merge request artica/pandorafms!4553
 2021-12-23 10:03:51 +00:00
Jose Gonzalez 7ea195c9c7 WIP: Setted graph_image_height 2021-12-22 11:06:11 +01:00
Jose Gonzalez 4924e0d6bc Updated audit logs view and added controller 2021-12-14 12:06:20 +01:00
fbsanchez f852df2f1c Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-12-14 11:03:04 +01:00
Daniel Rodriguez c773f5abd2 Merge branch 'ent-8321-formularios-modulos-de-tendencias-ticket-7456' into 'develop' 
Ent 8321 formularios modulos de tendencias ticket 7456

See merge request artica/pandorafms!4565
 2021-12-13 16:14:15 +00:00
Daniel Maya ae5a98ef67 #7925 Fixed group select 2021-12-13 15:09:22 +01:00
Calvo 6c94cc5e15 Fix visual bug 2021-12-13 12:00:24 +01:00
Calvo f6c0f50a90 Added missin param and Fixed error message and default interval 2021-12-10 18:00:33 +01:00
Daniel Barbero Martin 118b1e1b80 Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta 2021-12-07 08:34:03 +01:00
Calvo f382a5bf15 Fix trending module bugs 2021-12-03 11:02:11 +01:00
Calvo 7139b9e1b1 Switch prediction module to prediction planning 2021-12-03 10:38:25 +01:00
fbsanchez 3e7a81ea33 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-12-03 10:24:01 +01:00
Daniel Barbero Martin 94bd55fd39 wip reports alert actions 2021-12-02 16:55:53 +01:00
Calvo 66c4087679 Added module interval control and percentage checkbox 2021-12-02 14:12:19 +01:00
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
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 Barbero Martin a02c8a7988 wip reports alert actions 2021-12-01 15:15:45 +01:00
Calvo a38503491a Wip: trending prediction modules 2021-12-01 11:34:11 +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
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
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
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
fbsanchez 19643cd685 report for ncm simple 2021-11-29 15:26:19 +01:00
Calvo 7d8a5b029e Changed radio buttons to select on prediction modules 2021-11-29 14:45:19 +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
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 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
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