pandorafms/pandora_console
fermin831 78fd6850e7 Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
Conflicts:
	pandora_server/lib/PandoraFMS/DataServer.pm

Former-commit-id: 423e2d818730f97ef1ed0a286f717243731b5363
2019-01-29 18:15:59 +01:00
..
DEBIAN Updated version and build strings. 2019-01-29 11:08:54 +01:00
attachment htaccess. Allow connections from localhost to pandora_console/attachment 2018-09-27 16:21:06 +02:00
extensions Merge branch '2855-Buscador-en-la-vista-de-modulo-de-grupos' into 'develop' 2018-12-21 10:32:45 +01:00
extras Added tnetwork_matrix data structure 2019-01-21 18:49:13 +01:00
fonts
general Revert "included file required by update_manager_get_current_package function in footer file" 2018-12-03 11:54:17 +01:00
godmode Created dummy Network Traffic Top N report 2019-01-29 11:24:02 +01:00
images Merge remote-tracking branch 'origin/develop' into 2952_Mejora_en_wizard_para_crear_agentes_desde_la_metaconsola 2018-12-26 17:51:11 +01:00
include Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 2019-01-29 18:15:59 +01:00
mobile Included control for user set filter and admin set filter 2019-01-16 17:53:32 +01:00
operation Merge branch '3046-Fallos-en-edicion-de-usuario' into 'develop' 2019-01-16 12:26:27 +01:00
vendor fixed php7 2018-10-04 11:43:08 +02:00
.gitignore
AUTHORS
COPYING
DB_Dockerfile Fixes to the Dockerfiles. Thanks to marcelo-ochoa. 2018-05-04 10:02:52 +02:00
Dockerfile Fixes to the Dockerfiles. Thanks to marcelo-ochoa. 2018-05-04 10:02:52 +02:00
ajax.php Merge branch 'develop' into ent-2753-meter-profiler-en-el-docker 2018-12-20 18:17:57 +01:00
composer.json fixed php7 2018-10-04 11:43:08 +02:00
composer.lock fixed php7 2018-10-04 11:43:08 +02:00
docker_entrypoint.sh Removed all traces of anytermd from code 2017-09-04 16:19:56 +02:00
index.php Merge branch 'develop' into ent-2753-meter-profiler-en-el-docker 2018-12-20 18:17:57 +01:00
install.php Updated version and build strings. 2019-01-29 11:08:54 +01:00
pandora_console.redhat.spec Updated version and build strings. 2019-01-29 11:08:54 +01:00
pandora_console.spec Updated version and build strings. 2019-01-29 11:08:54 +01:00
pandora_console_install Updated version and build strings. 2019-01-29 11:08:54 +01:00
pandora_console_logrotate_centos
pandora_console_logrotate_suse
pandora_console_logrotate_ubuntu
pandora_console_upgrade
pandoradb.sql Added tnetwork_matrix data structure 2019-01-21 18:49:13 +01:00
pandoradb_data.sql Updated version and build strings. 2019-01-29 11:08:54 +01:00