Daniel Barbero Martin 867c6a1415 Merge remote-tracking branch 'origin/develop' into ent-8621-copiando-a-grafana-4-color-tabs-como-widget-en-dashboard ... Conflicts: pandora_console/include/javascript/pandora.js		2022-06-28 17:02:01 +02:00
..
DEBIAN	Auto-updated build strings.	2022-06-28 01:01:20 +02:00
attachment	…
custom/temp/dir/path/mpdf/ttfontdata	…
extensions	…
extras	Clean version.	2022-06-23 19:54:26 +02:00
fonts	…
general	Merge branch 'ent-8888-consolas-visuales-vista-movil-carrefour' into 'develop'	2022-06-23 10:07:24 +00:00
godmode	Merge branch 'ent-1419-umbrales-en-graficas-pdf-4649-com1' into 'develop'	2022-06-28 13:45:53 +00:00
images	new icons widgets dashboards pandora_enterprise#8621	2022-06-27 16:00:36 +02:00
include	Merge remote-tracking branch 'origin/develop' into ent-8621-copiando-a-grafana-4-color-tabs-como-widget-en-dashboard	2022-06-28 17:02:01 +02:00
log	…
mobile	Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado	2022-06-23 12:51:35 +02:00
operation	Merge remote-tracking branch 'origin/develop' into ent-7960-filtros-de-alertas-sonoras-sound-events-2	2022-06-27 16:07:19 +02:00
tests	…
tools	…
update_manager_client	new images update manager online pandora_enterprise#9192	2022-06-22 14:48:54 +02:00
vendor	refactor events meta pandora_enterprise#9086	2022-06-03 09:20:51 +02:00
views	Merge branch 'ent-9085-13692-Fallo-permisos-en-creacion-edicion-de-List-of-Special-Days' into 'develop'	2022-06-28 14:32:31 +00:00
.gitignore	…
.htaccess	…
AUTHORS	…
COPYING	…
DB_Dockerfile	…
Dockerfile	…
ajax.php	…
composer.json	refactor events meta pandora_enterprise#9086	2022-06-03 09:20:51 +02:00
composer.lock	refactor events meta pandora_enterprise#9086	2022-06-01 17:39:12 +02:00
docker_entrypoint.sh	…
index.php	ent-9067 fixed notification system	2022-06-16 16:19:33 +02:00
install.php	Auto-updated build strings.	2022-06-28 01:01:20 +02:00
pandora_console.redhat.spec	Auto-updated build strings.	2022-06-28 01:01:20 +02:00
pandora_console.rhel7.spec	Auto-updated build strings.	2022-06-28 01:01:20 +02:00
pandora_console.spec	Auto-updated build strings.	2022-06-28 01:01:20 +02:00
pandora_console_install	Updated version and build strings.	2022-06-23 08:27:31 +02:00
pandora_console_logrotate_centos	…
pandora_console_logrotate_suse	…
pandora_console_logrotate_ubuntu	…
pandora_console_upgrade	…
pandora_websocket_engine	…
pandora_websocket_engine.service	…
pandoradb.sql	Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado	2022-06-23 12:51:35 +02:00
pandoradb_data.sql	Clean version.	2022-06-23 19:54:26 +02:00
ws.php	…