pandorafms/pandora_console
José González 623b729001 Merge branch 'develop' into 'ent-1175-copyright-actualizados'
# Conflicts:
#   pandora_agents/pc/Win32/pandora_agent.conf
#   pandora_agents/win32/bin/pandora_agent.conf
#   pandora_console/extensions/realtime_graphs.php
#   pandora_console/godmode/snmpconsole/snmp_alert.php
#   pandora_console/include/functions_ui.php
#   pandora_console/install.php
#   pandora_console/operation/agentes/realtime_win.php
2020-12-14 11:10:35 +01:00
..
DEBIAN Merge branch 'develop' into 'ent-1175-copyright-actualizados' 2020-12-14 11:10:35 +01:00
attachment change htacces to be compatible with php-fpm 2020-07-30 08:57:54 +02:00
extensions Merge branch 'develop' into 'ent-1175-copyright-actualizados' 2020-12-14 11:10:35 +01:00
extras inventory alerts 2020-12-04 10:31:22 +01:00
fonts
general Merge branch 'develop' into 'ent-1175-copyright-actualizados' 2020-12-14 11:10:35 +01:00
godmode Merge branch 'develop' into 'ent-1175-copyright-actualizados' 2020-12-14 11:10:35 +01:00
images Merge branch 'develop' into 'ent-6398-Poner-ojito-mostrar-passwords' 2020-11-19 15:21:58 +01:00
include Merge branch 'develop' into 'ent-1175-copyright-actualizados' 2020-12-14 11:10:35 +01:00
log changed console and audit log locations 2020-06-08 10:48:48 +02:00
mobile Updated copyrights 2020-11-27 13:52:35 +01:00
operation Merge branch 'develop' into 'ent-1175-copyright-actualizados' 2020-12-14 11:10:35 +01:00
tests
tools Updated copyrights 2020-11-27 13:52:35 +01:00
vendor Backup upload 2020-06-30 12:16:51 +02:00
views/dashboard Updated copyrights 2020-11-27 13:52:35 +01:00
.gitignore minor changes in log files 2020-06-12 09:40:12 +02:00
.htaccess change htacces to be compatible with php-fpm 2020-07-30 08:57:54 +02:00
AUTHORS
COPYING
DB_Dockerfile
Dockerfile
ajax.php Updated copyrights 2020-11-27 13:52:35 +01:00
composer.json WS gotty extension - global 2019-10-17 15:31:17 +02:00
composer.lock
docker_entrypoint.sh
index.php Merge branch 'develop' into 'ent-1175-copyright-actualizados' 2020-12-14 11:10:35 +01:00
install.php Merge branch 'develop' into 'ent-1175-copyright-actualizados' 2020-12-14 11:10:35 +01:00
pandora_console.redhat.spec Auto-updated build strings. 2020-12-14 01:00:14 +01:00
pandora_console.rhel7.spec Auto-updated build strings. 2020-12-14 01:00:14 +01:00
pandora_console.spec Auto-updated build strings. 2020-12-14 01:00:14 +01:00
pandora_console_install Updated version and build strings. 2020-12-09 16:44:12 +01:00
pandora_console_logrotate_centos Update pandora_console_logrotate_centos 2020-06-11 16:37:40 +02:00
pandora_console_logrotate_suse Update pandora_console_logrotate_suse 2020-06-11 16:38:06 +02:00
pandora_console_logrotate_ubuntu Update pandora_console_logrotate_ubuntu 2020-06-11 16:38:28 +02:00
pandora_console_upgrade
pandora_websocket_engine changed console and audit log locations 2020-06-08 10:48:48 +02:00
pandora_websocket_engine.service changed console and audit log locations 2020-06-08 10:48:48 +02:00
pandoradb.sql Merge branch 'develop' into 'ent-1175-copyright-actualizados' 2020-12-14 11:10:35 +01:00
pandoradb_data.sql Updated copyrights 2020-11-27 13:52:35 +01:00
ws.php Updated copyrights 2020-11-27 13:52:35 +01:00