18026 Commits

Author SHA1 Message Date
nramon
a84b1af4af Merge branch '2390-Añadir-en-filtro-de-eventos-todos-los-campos-posibles-de-búsqueda-dev' into 'develop'
Added source, comment and id_extra in event filter

See merge request artica/pandorafms!1722
2018-09-03 15:47:36 +02:00
nramon
c3c26e9618 Merge branch '2712-mejora-rendimiento' into 'develop'
fixed ajax.php two call function translate

See merge request artica/pandorafms!1721
2018-09-03 15:46:46 +02:00
artica
b52661054d Auto-updated build strings. 2018-09-03 00:01:24 +02:00
artica
06b36965a2 Auto-updated build strings. 2018-09-02 00:01:23 +02:00
artica
97c562163e Auto-updated build strings. 2018-09-01 00:01:24 +02:00
danielmaya
5b30aa5560 Added source, comment and id_extra in event filter 2018-08-31 16:25:12 +02:00
daniel
5cd4e0d300 fixed ajax.php two call function translate 2018-08-31 13:46:12 +02:00
artica
43a7d4973b Auto-updated build strings. 2018-08-31 00:01:28 +02:00
vgilc
99f42aed87 Merge branch 'fix-plugin-timeout' into 'develop'
Fixed plugin timeout.

See merge request artica/pandorafms!1720
2018-08-30 08:05:36 +02:00
Junichi Satoh
34c553f5b4 Fixed plugin timeout. 2018-08-30 13:30:22 +09:00
artica
9d35a66ad3 Auto-updated build strings. 2018-08-30 00:01:25 +02:00
vgilc
0aeef6367a Merge branch '1958-Informe-agrupado-de-grupo' into 'develop'
fixed recursion option in custom report's item editor

See merge request artica/pandorafms!1719
2018-08-29 08:26:58 +02:00
artica
91bdb0094a Auto-updated build strings. 2018-08-29 00:01:26 +02:00
alejandro-campos
5f4d76f3a7 fixed recursion option in custom report's item editor 2018-08-28 16:38:32 +02:00
vgilc
3f1d7e9947 Merge branch '2682_Cambiar_ayuda_contextual' into 'develop'
Changed soft graphs hint

See merge request artica/pandorafms!1718
2018-08-28 16:00:53 +02:00
samucarc
dae0021db9 Changed soft graphs hint 2018-08-28 11:02:27 +02:00
vgilc
75d3d38bec Merge branch '2667-Añadir-ayuda-online-en-la-seccion-de-etiqueta-de-texto-de-una-consola-visual' into 'develop'
fixed text errors in visual console macros' help text

See merge request artica/pandorafms!1717
2018-08-28 10:41:44 +02:00
alejandro-campos
3b7b54cb68 fixed text errors in visual console macros' help text 2018-08-28 10:31:24 +02:00
vgilc
7a6c3c16ec Merge branch '1920_Informe_de_alertas' into 'develop'
Fixed alert report date

See merge request artica/pandorafms!1715
2018-08-28 10:30:23 +02:00
vgilc
fc820a8eaa Merge branch '2654-No-se-puede-editar-agente-y-no-aparece-QR3' into 'develop'
Fixed bug in agent-manager

See merge request artica/pandorafms!1716
2018-08-28 10:29:53 +02:00
manuel.montes
e59f123d19 Fixed bug in agent-manager 2018-08-28 10:23:25 +02:00
artica
7c37a7d2ee Auto-updated build strings. 2018-08-28 00:01:27 +02:00
samucarc
9915518b8e Fixed alert report date 2018-08-27 18:00:44 +02:00
vgilc
a741e37f23 Merge branch '2667-Añadir-ayuda-online-en-la-seccion-de-etiqueta-de-texto-de-una-consola-visual' into 'develop'
2667 añadir ayuda online en la seccion de etiqueta de texto de una consola visual

See merge request artica/pandorafms!1713
2018-08-27 09:18:03 +02:00
vgilc
7f38e8273f Merge branch '2597_Errata_en_cluster' into 'develop'
Fixed visual error

See merge request artica/pandorafms!1698
2018-08-27 09:17:23 +02:00
vgilc
266dba4600 Merge branch '2654-No-se-puede-editar-agente-y-no-aparece-QR2' into 'develop'
Fixed bug in agent manager

See merge request artica/pandorafms!1711
2018-08-27 09:15:11 +02:00
vgilc
df4c61d673 Merge branch '2379-Entrar-a-consola-sin-licencia-mobile' into 'develop'
Implemented license validation for mobile console

See merge request artica/pandorafms!1712
2018-08-27 09:14:32 +02:00
vgilc
69545d7ed8 Merge branch 'ent-2153-vistas-en-las-que-no-se-ha-tenido-en-cuenta-los-grupos-secundarios' into 'develop'
Ent 2153 vistas en las que no se ha tenido en cuenta los grupos secundarios

See merge request artica/pandorafms!1708
2018-08-27 09:10:00 +02:00
vgilc
a2ecec29cc Merge branch 'ent-2661-fallos-al-sincronizar-la-configuracion-de-la-metaconsola-en-el-nodo' into 'develop'
Revert "Improved metaconsole sync (added centralized management)"

See merge request artica/pandorafms!1696
2018-08-27 09:08:15 +02:00
vgilc
f0494ea598 Merge branch 'fix/out-of-order-data-6120' into 'develop'
Do not update tagente_estado when processing out-of-order data.

See merge request artica/pandorafms!1624
2018-08-27 09:07:06 +02:00
artica
930a939764 Auto-updated build strings. 2018-08-27 00:01:22 +02:00
artica
6a99bb9aec Auto-updated build strings. 2018-08-26 00:01:22 +02:00
artica
f345c01e3e Auto-updated build strings. 2018-08-25 00:01:25 +02:00
alejandro-campos
5f593df22a minor fix in visual maps macros help text 2018-08-24 09:19:48 +02:00
alejandro-campos
a9ac4462a5 added help dialog in visual console editor 2018-08-24 09:15:10 +02:00
artica
733be2d8ba Auto-updated build strings. 2018-08-24 00:01:24 +02:00
alejandro-campos
8e2f4b0eaa Implemented license validation for mobile console 2018-08-23 13:57:41 +02:00
manuel.montes
5d495226d3 Fixed bug in agent manager 2018-08-23 08:28:02 +02:00
artica
80cec1aadb Auto-updated build strings. 2018-08-23 00:01:29 +02:00
artica
99858d3371 Auto-updated build strings. 2018-08-22 00:01:27 +02:00
fermin831
0a70284eaa [Secondary groups] Group report and adapted group_stat table to secondary groups 2018-08-21 13:34:52 +02:00
fermin831
399c9c2d58 [Secondary groups] Fixed agent/modules view 2018-08-21 13:33:16 +02:00
vgilc
281dbb4784 Merge branch '2664-No_funcionan_Automatic_Combined_Graphs_en_Metaconsola' into 'develop'
fixed error automatic combined graph

See merge request artica/pandorafms!1707
2018-08-21 10:58:57 +02:00
daniel
8e845d2948 fixed error automatic combined graph 2018-08-21 10:54:36 +02:00
vgilc
69513fdc63 Merge branch '2609-cambios-en-la-forma-de-gestionar-grupos-secundarios-en-la-vista-de-usuario-3' into 'develop'
Added secondary groups and no hierarchy documentation

See merge request artica/pandorafms!1700
2018-08-21 08:34:53 +02:00
fermin831
4d44fcb512 Added secondary groups documentation 2018-08-21 08:27:46 +02:00
artica
e518135adf Auto-updated build strings. 2018-08-21 00:01:24 +02:00
vgilc
5b03894b19 Merge branch '2664-No_funcionan_Automatic_Combined_Graphs_en_Metaconsola' into 'develop'
fixed error for each agent report metaconsole

See merge request artica/pandorafms!1706
2018-08-20 17:40:39 +02:00
daniel
fac1b3b616 fixed error for each agent report metaconsole 2018-08-20 17:28:14 +02:00
vgilc
c072ed1fdb Merge branch '2664-No_funcionan_Automatic_Combined_Graphs_en_Metaconsola' into 'develop'
fixed errors automatic combined graph report metaconsole

See merge request artica/pandorafms!1703
2018-08-20 15:27:04 +02:00