Alejandro Fraguas e55915e1e2 Merge branch 'ent-3199-Parsear-espacios-al-final-y-caracteres-especiales-al-introducir-nombre-agente-en-consola' into 'develop' ... 3199-Parsear-espacios-al-final-y-caracteres-especiales-al-introducir-nombre-agente-en-consola into develop See merge request artica/pandorafms!2193 Former-commit-id: c6e976b78254e6b5b82dddf206c419737bd99a83		2019-02-22 10:01:43 +01:00
..
DEBIAN	Auto-updated build strings.	2019-02-22 00:01:38 +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 339-No_cortar_elementos_en_PDF	2019-02-07 10:30:23 +01:00
extras	Merge branch 'develop' into 3193-Mal-unidades-de-tamaño-de-log-en-diagnostic-info	2019-02-18 16:25:30 +01:00
fonts	…
general	Fixed conflict	2019-02-07 17:33:43 +01:00
godmode	Merge branch 'ent-3199-Parsear-espacios-al-final-y-caracteres-especiales-al-introducir-nombre-agente-en-consola' into 'develop'	2019-02-22 10:01:43 +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 'ent-3511-Bug-en-la-edicion-del-widget-de-tipo-Agent/Module-View' into 'develop'	2019-02-22 09:18:11 +01:00
mobile	Merge branch 'develop' into 3154-Agent-name-en-vistas-de-alertas-de-consola-movil	2019-02-15 15:30:36 +01:00
operation	Merge branch 'ent-3511-Bug-en-la-edicion-del-widget-de-tipo-Agent/Module-View' into 'develop'	2019-02-22 09:18:11 +01:00
vendor	fixed php7	2018-10-04 11:43:08 +02:00
.gitignore	…
AUTHORS	…
COPYING	…
DB_Dockerfile	…
Dockerfile	…
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	fixed pdf report	2019-02-04 12:10:52 +01:00
install.php	Auto-updated build strings.	2019-02-22 00:01:38 +01:00
pandora_console.redhat.spec	Auto-updated build strings.	2019-02-22 00:01:38 +01:00
pandora_console.spec	Auto-updated build strings.	2019-02-22 00:01:38 +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	Revert "Added tnetwork_matrix data structure"	2019-01-21 18:43:35 +01:00
pandoradb_data.sql	fixed mr token	2019-01-30 17:11:48 +01:00