tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
pandorafms/pandora_console
History
Daniel Rodriguez 92aafb5953 Merge branch '2978-INTRACOM-Funciones-API-traps-y-control-de-acceso-de-aplicacion-externa-Fix-de-código-pisado-2' into 'develop' 
Add traps, and other intracom API functions - #2978

See merge request artica/pandorafms!2119

Former-commit-id: 42bf67414f74d373ece3f83b4eecf2e4fd17f049
 		2019-01-17 12:08:03 +01:00
..
DEBIAN Auto-updated build strings. 2019-01-17 00:01:26 +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 '3254-error_al_pasar_pandoradb_migrate_6_to_7' into 'develop' 2019-01-02 11:50:32 +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 '3134-Tardanza_a_la_hora_de_aplicar_cambios_masivamente' into 'develop' 2019-01-15 12:35:11 +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 '2978-INTRACOM-Funciones-API-traps-y-control-de-acceso-de-aplicacion-externa-Fix-de-código-pisado-2' into 'develop' 2019-01-17 12:08:03 +01:00
mobile Included control for user set filter and admin set filter 2019-01-16 17:53:32 +01:00
operation Merge branch '3046-Fallos-en-edicion-de-usuario' into 'develop' 2019-01-16 12:26:27 +01:00
vendor fixed php7 2018-10-04 11:43:08 +02:00
.gitignore
…
AUTHORS
…
COPYING
…
DB_Dockerfile
…
Dockerfile
…
ajax.php Merge branch 'develop' into ent-2753-meter-profiler-en-el-docker 2018-12-20 18:17:57 +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 Merge branch 'develop' into ent-2753-meter-profiler-en-el-docker 2018-12-20 18:17:57 +01:00
install.php Auto-updated build strings. 2019-01-17 00:01:26 +01:00
pandora_console.redhat.spec Auto-updated build strings. 2019-01-17 00:01:26 +01:00
pandora_console.spec Auto-updated build strings. 2019-01-17 00:01:26 +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