pandorafms/pandora_console
fermin831 2332001884 Merge branch 'ent-3431-discovery-host-devices' into ent-1798-monitorizacion-aws-amazon
Conflicts:
	pandora_console/godmode/servers/discovery.php

Former-commit-id: 4e840a1738523e2e0570413e8e7dedb02b265919
2019-02-18 08:50:54 +01:00
..
DEBIAN Auto-updated build strings. 2019-02-08 00:01:29 +01:00
attachment Changed the format of the .js and .html files 2019-01-30 12:27:18 +01:00
extensions Merge remote-tracking branch 'origin/develop' into 3446-Imagen-grupos-no-se-muestra-None 2019-02-07 08:59:45 +01:00
extras Merge remote-tracking branch 'origin/ent-3430-discovery' into ent-3431-discovery-host-devices 2019-02-14 10:59:27 +01:00
fonts
general Discovery Tasks first tasks and some minor fixes 2019-02-15 18:42:44 +01:00
godmode Merge branch 'ent-3431-discovery-host-devices' into ent-1798-monitorizacion-aws-amazon 2019-02-18 08:50:54 +01:00
images H&D tasklist and some visual changes 2019-02-15 18:05:59 +01:00
include discovery minor style changes 2019-02-15 18:44:59 +01:00
mobile Changed the format of the .php files 2019-01-30 16:18:44 +01:00
operation Merge remote-tracking branch 'origin/ent-3430-discovery' into ent-3431-discovery-host-devices 2019-02-14 10:59: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 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 fixed php7 2018-10-04 11:43:08 +02:00
docker_entrypoint.sh
index.php Changed the format of the .php files 2019-01-30 16:18:44 +01:00
install.php missed install... 2019-02-14 17:20:00 +01:00
pandora_console.redhat.spec Auto-updated build strings. 2019-02-08 00:01:29 +01:00
pandora_console.spec Auto-updated build strings. 2019-02-08 00:01:29 +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 Merge remote-tracking branch 'origin/ent-3430-discovery' into ent-3431-discovery-host-devices 2019-02-14 10:59:27 +01:00
pandoradb_data.sql Merge remote-tracking branch 'origin/ent-3430-discovery' into ent-3371-sistema-de-notificaciones-pandora 2019-02-12 12:41:11 +01:00