fermin831 0a0506b9ff Merge branch 'develop' into ent-1365-graficas-gauge-no-muestran-umbrales-menores-a-1 ... Conflicts resolved: * pandora_console/include/graphs/pandora.d3.js		2017-10-31 12:47:42 +01:00
..
DEBIAN	Auto-updated build strings.	2017-10-31 00:01:11 +01:00
attachment	…
extensions	Merge branch 'develop' into 1125-Vista-de-Agente-Modulo	2017-10-30 15:15:39 +01:00
extras	Change pandora migrate and add mr8 changes - #654	2017-10-30 17:26:35 +01:00
fonts	…
general	Add minor realeases doc link in header advice modal window - #951	2017-10-30 18:20:43 +01:00
godmode	Merge branch '654-Cambios-en-informes-de-maximo-minimo-y-media-4480-cherry' into 'develop'	2017-10-31 12:13:55 +01:00
images	Merge branch 'develop' into 1396-new-circular-percentile-item-in-visual-console-dev	2017-10-26 14:41:07 +02:00
include	Merge branch 'develop' into ent-1365-graficas-gauge-no-muestran-umbrales-menores-a-1	2017-10-31 12:47:42 +01:00
mobile	Merge branch '1170-Pandora-FMS-Aplicación-movil-Error-La-barra-de-histograma' into 'develop'	2017-09-11 09:12:54 +02:00
operation	Merge branch 'develop' into 1406-Visual-consoles-e-imagenes-HTML-4623-com1	2017-10-30 13:27:40 +01:00
.gitignore	…
AUTHORS	…
COPYING	…
DB_Dockerfile	…
Dockerfile	Removed all traces of anytermd from code	2017-09-04 16:19:56 +02:00
ajax.php	…
docker_entrypoint.sh	Removed all traces of anytermd from code	2017-09-04 16:19:56 +02:00
index.php	…
install.php	Auto-updated build strings.	2017-10-31 00:01:11 +01:00
install.php.orig	…
pandora_console.redhat.spec	Auto-updated build strings.	2017-10-31 00:01:11 +01:00
pandora_console.redhat.spec.orig	…
pandora_console.spec	Auto-updated build strings.	2017-10-31 00:01:11 +01:00
pandora_console.spec.orig	…
pandora_console_install	Updated version and build strings.	2017-10-23 17:45:29 +02:00
pandora_console_logrotate_centos	…
pandora_console_logrotate_suse	…
pandora_console_logrotate_ubuntu	…
pandora_console_upgrade	…
pandoradb.sql	Change pandoradb treport_content_template and treport_content fields - #654	2017-10-30 17:27:37 +01:00
pandoradb_data.sql	Updated version and build strings.	2017-10-23 17:45:29 +02:00