Daniel Maya c1ee43a064 resolved conflicts ...

Former-commit-id: 6934eb56d50cfaa16a978472de044cfe135e906a

2019-02-06 17:00:15 +01:00

..

agentes

fixed error create modules network

2019-01-11 12:01:48 +01:00

alerts

Merge branch '3112-Bug-en-creacion-de-alertas-en-cluster' into 'develop'

2019-01-09 10:34:30 +01:00

category

Fixed styles metaconsole

2015-07-07 13:57:47 +02:00

db

[Rebranding] Miscelaneous rebranding

2018-05-22 19:22:37 +02:00

events

Added forgotten include

2018-12-10 18:46:01 +01:00

gis_maps

Fixed a problem with the autocomplete agent cache

2018-08-17 15:03:24 +02:00

groups

add new tree view edition group

2018-09-18 09:28:22 +02:00

massive

resolved conflicts

2019-02-06 17:00:15 +01:00

modules

Merge branch '1886-Bug-Aviso-Enterprise-Network-Component-Open' into 'develop'

2018-11-30 13:37:44 +01:00

netflow

Created function that adds class checkselected and added inputs to select all in several tables - #2429

2018-09-13 16:07:40 +02:00

reporting

Merge branch '1931_Cambiar_el_cuerpo_del_email_al_enviar_reportes' into 'develop'

2019-01-10 14:49:18 +01:00

servers

Merge branch '2429-Resaltar-elementos-al-pasar-por-encima-o-marcar' into 'develop'

2018-10-29 09:17:54 +01:00

setup

fixed error log js and warning php visual style

2018-11-23 09:21:22 +01:00

snmpconsole

Merge branch '1704-Cuadro-ENORME-cuando-se-pone-un-número-en-Custom-Value-4985-com1' into 'develop'

2018-01-02 10:27:20 +01:00

tag

Reorganizate code for use OS/module groups in metaconsole. Tiquet #3490

2016-06-06 13:05:25 +02:00

update_manager

create alert php7

2018-11-14 18:15:48 +01:00

users

Fixed audit log

2018-12-11 17:17:46 +01:00

admin_access_logs.php

add safe output function to strings printed in system audit log

2018-12-10 15:47:25 +01:00

audit_log_csv.php

fixed errors session_start

2018-11-21 13:08:58 +01:00

extensions.php

Created function that adds class checkselected and added inputs to select all in several tables - #2429

2018-09-13 16:07:40 +02:00

menu.php

Fixed

2018-12-13 13:25:37 +01:00