Daniel Rodriguez f1dbd40a6a Merge branch 'ent-3421-error-en-un-push' into 'develop' ...

Ent 3421 error en un push

See merge request artica/pandorafms!2138

Former-commit-id: 6740a7f61adebbacaeb40b47b42973e4b518d12d

2019-01-22 10:04:07 +01:00

..

attachment

htaccess. Allow connections from localhost to pandora_console/attachment

2018-09-27 16:21:06 +02:00

DEBIAN

Auto-updated build strings.

2019-01-22 00:01:24 +01:00

extensions

Merge branch '2855-Buscador-en-la-vista-de-modulo-de-grupos' into 'develop'

2018-12-21 10:32:45 +01:00

extras

Revert "Added tnetwork_matrix data structure"

2019-01-21 18:43:35 +01:00

fonts

fixed errors

2017-03-16 18:41:53 +01:00

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

Auto-updated build strings.

2019-01-22 00:01:24 +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

Update gitignore of pandora_console and pandora_server

2017-03-06 10:16:15 +01:00

ajax.php

Merge branch 'develop' into ent-2753-meter-profiler-en-el-docker

2018-12-20 18:17:57 +01:00

AUTHORS

Update AUTHORS

2016-05-10 17:40:12 +02: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

COPYING

…

DB_Dockerfile

Fixes to the Dockerfiles. Thanks to marcelo-ochoa.

2018-05-04 10:02:52 +02:00

docker_entrypoint.sh

Removed all traces of anytermd from code

2017-09-04 16:19:56 +02:00

Dockerfile

Fixes to the Dockerfiles. Thanks to marcelo-ochoa.

2018-05-04 10:02:52 +02:00

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-22 00:01:24 +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

…

pandora_console.redhat.spec

Auto-updated build strings.

2019-01-22 00:01:24 +01:00

pandora_console.spec

Auto-updated build strings.

2019-01-22 00:01:24 +01:00

pandoradb_data.sql

Custom fields view add new filters

2018-12-03 11:36:34 +01:00

pandoradb.sql

Revert "Added tnetwork_matrix data structure"

2019-01-21 18:43:35 +01:00