pandorafms/pandora_console
samucarc 5ecc9276e0 Merge branch 'develop' into 2523-APIListar,-crear,-borrar-y-modificar-Usuarios-desde-la-API-#6167-EUComm
# Conflicts:
#	pandora_console/include/functions_api.php


Former-commit-id: 6ba5a8f0fd2d02daca0d05e08b27981c7137f0bc
2019-01-03 16:25:40 +01:00
..
DEBIAN Auto-updated build strings. 2018-12-21 00:01:27 +01:00
attachment htaccess. Allow connections from localhost to pandora_console/attachment 2018-09-27 16:21:06 +02:00
extensions Merge branch '2855-Buscador-en-la-vista-de-modulo-de-grupos' into 'develop' 2018-12-21 10:32:45 +01:00
extras Merge branch 'develop' into 1440-Exportar-informes-pdf-en-formato-apaisado 2018-12-19 19:15:43 +01:00
fonts
general Revert "included file required by update_manager_get_current_package function in footer file" 2018-12-03 11:54:17 +01:00
godmode Merge branch '3061-Mensaje-de-error-al-crear-un-modulo-sin-nombre' into 'develop' 2018-12-21 10:29:14 +01:00
images Added a new icon 2018-12-10 09:19:26 +01:00
include Merge branch 'develop' into 2523-APIListar,-crear,-borrar-y-modificar-Usuarios-desde-la-API-#6167-EUComm 2019-01-03 16:25:40 +01:00
mobile Merge branch 'ent-3147-mobile-console-pagination-bugfix' into 'develop' 2018-11-23 12:54:53 +01:00
operation Merge branch '2584_Visual_en_Mapas_GIS' into 'develop' 2018-12-21 10:33:17 +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 fixed errors session_start 2018-11-21 13:08:58 +01:00
composer.json fixed php7 2018-10-04 11:43:08 +02:00
composer.lock fixed php7 2018-10-04 11:43:08 +02:00
docker_entrypoint.sh
index.php Revert "Removed html entities in the audit views" 2018-12-10 13:40:37 +01:00
install.php Auto-updated build strings. 2018-12-21 00:01:27 +01:00
pandora_console.redhat.spec Auto-updated build strings. 2018-12-21 00:01:27 +01:00
pandora_console.spec Auto-updated build strings. 2018-12-21 00:01:27 +01:00
pandora_console_install Updated version and build strings. 2018-12-13 11:14:24 +01:00
pandora_console_logrotate_centos
pandora_console_logrotate_suse
pandora_console_logrotate_ubuntu
pandora_console_upgrade
pandoradb.sql Merge branch 'develop' into 1440-Exportar-informes-pdf-en-formato-apaisado 2018-12-19 19:15:43 +01:00
pandoradb_data.sql Custom fields view add new filters 2018-12-03 11:36:34 +01:00