fermin831 b2f046e4d6 Merge remote-tracking branch 'origin/ent-3595-discovery-fase-2' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 ... Conflicts: pandora_console/extras/mr/26.sql pandora_console/include/class/ConsoleSupervisor.php pandora_console/include/class/NetworkMap.class.php pandora_console/include/styles/pandora.css pandora_console/operation/menu.php Former-commit-id: 2a0661a65772d4a91f95587d77b0d1287fb66b18		2019-03-27 12:11:23 +01:00
..
DEBIAN	Auto-updated build strings.	2019-03-27 00:01:24 +01:00
attachment	Changed the format of the .js and .html files	2019-01-30 12:27:18 +01:00
extensions	New view user edit	2019-03-20 13:26:15 +01:00
extras	Merge remote-tracking branch 'origin/ent-3595-discovery-fase-2' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1	2019-03-27 12:11:23 +01:00
fonts	…
general	Merge remote-tracking branch 'origin/develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1	2019-03-27 11:59:25 +01:00
godmode	Merge remote-tracking branch 'origin/ent-3595-discovery-fase-2' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1	2019-03-27 12:11:23 +01:00
images	Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1	2019-03-26 10:11:13 +01:00
include	Merge remote-tracking branch 'origin/ent-3595-discovery-fase-2' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1	2019-03-27 12:11:23 +01:00
mobile	Merge branch 'develop' into 3154-Agent-name-en-vistas-de-alertas-de-consola-movil	2019-02-15 15:30:36 +01:00
operation	Merge remote-tracking branch 'origin/ent-3595-discovery-fase-2' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1	2019-03-27 12:11:23 +01:00
vendor	…
.gitignore	…
AUTHORS	…
COPYING	…
DB_Dockerfile	…
Dockerfile	…
ajax.php	Changed the format of the .php files	2019-01-30 16:18:44 +01:00
composer.json	Changed the format of the .js and .html files	2019-01-30 12:27:18 +01:00
composer.lock	…
docker_entrypoint.sh	…
index.php	Merge remote-tracking branch 'origin/develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1	2019-03-27 11:59:25 +01:00
install.php	Auto-updated build strings.	2019-03-27 00:01:24 +01:00
pandora_console.redhat.spec	Auto-updated build strings.	2019-03-27 00:01:24 +01:00
pandora_console.spec	Auto-updated build strings.	2019-03-27 00:01:24 +01:00
pandora_console_install	Updated version and build strings.	2019-02-27 11:25:50 +01:00
pandora_console_logrotate_centos	…
pandora_console_logrotate_suse	…
pandora_console_logrotate_ubuntu	…
pandora_console_upgrade	…
pandoradb.sql	Merge remote-tracking branch 'origin/ent-3595-discovery-fase-2' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1	2019-03-27 12:11:23 +01:00
pandoradb_data.sql	Merge remote-tracking branch 'origin/ent-3610-Vista-Edicion-de-Usuario' into ent-3595-discovery-fase-2	2019-03-20 15:46:33 +01:00