pandorafms/pandora_console/godmode
fermin831 b660da6e84 Merge remote-tracking branch 'origin/develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
Conflicts:
	pandora_console/extras/mr/26.sql
	pandora_console/install.php

Former-commit-id: dda11929acf5f741e0a4d290b4607ae72683284b
2019-03-14 10:49:16 +01:00
..
agentes Merge branch 'ent-3692-No-esta-incluyendo-version-en-wizard-interfaces-para-modulos-satelite' into 'develop' 2019-03-13 14:05:08 +01:00
alerts Merge remote-tracking branch 'origin/develop' into 3446-Imagen-grupos-no-se-muestra-None 2019-02-07 08:59:45 +01:00
category Changed the format of the .php files 2019-01-30 16:18:44 +01:00
db Changed the format of the .php files 2019-01-30 16:18:44 +01:00
events Changed the format of the .php files 2019-01-30 16:18:44 +01:00
gis_maps Merge remote-tracking branch 'origin/develop' into 3446-Imagen-grupos-no-se-muestra-None 2019-02-07 08:59:45 +01:00
groups fixed warnings php 2019-02-25 13:02:39 +01:00
massive Merge remote-tracking branch 'origin/develop' into ent-3084-Warnings_en_PHP_7 2019-03-12 13:07:12 +01:00
modules fixed minor error 2019-03-07 14:52:31 +01:00
netflow [Netflow live] Removed agregate by none 2019-03-13 19:16:21 +01:00
reporting Fixed resolution in netflow reports 2019-03-13 20:15:53 +01:00
servers Merge remote-tracking branch 'origin/develop' into ent-3084-Warnings_en_PHP_7 2019-03-12 13:07:12 +01:00
setup Merge remote-tracking branch 'origin/develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 2019-03-14 10:49:16 +01:00
snmpconsole new header and menu 2019-02-25 12:23:15 +01:00
tag Changed the format of the .php files 2019-01-30 16:18:44 +01:00
update_manager Added changes 2019-02-13 12:21:31 +01:00
users Changed the format of the .php files 2019-01-30 16:18:44 +01:00
wizards minor fixes, removed tuser_task_scheduled from tasklist, also cde over ipam references 2019-03-01 11:08:49 +01:00
admin_access_logs.php Changed the format of the .php files 2019-01-30 16:18:44 +01:00
audit_log_csv.php Changed the format of the .php files 2019-01-30 16:18:44 +01:00
extensions.php Changed the format of the .php files 2019-01-30 16:18:44 +01:00
menu.php new header and menu 2019-02-26 10:43:59 +01:00