d0ded14018
Merge branch 'ent-3328-7200-correcciones-consola-vmware' into 'develop'
...
Ent 3328 7200 correcciones consola vmware
See merge request artica/pandorafms!2126
Former-commit-id: e050791eefa12e7df5348fb190788be539e56c05
2019-01-17 16:29:11 +01:00
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
80d64f3d6b
Merge branch 'pandora_enterprise#2987' into 'develop'
...
Solved errors in mobile events view
See merge request artica/pandorafms!1907
Former-commit-id: 8efb7e917cf6a86b93d9c2905f1c63c292c742e3
2019-01-17 11:59:07 +01:00
bfecbc5337
Merge branch '2952_Mejora_en_wizard_para_crear_agentes_desde_la_metaconsola' into 'develop'
...
Added improvements in the creation of agents in the meta console
See merge request artica/pandorafms!1894
Former-commit-id: b5c450723740359204e4062a89a252247ee5157e
2019-01-17 10:04:30 +01:00
6bf6fd19d6
Auto-updated build strings.
...
Former-commit-id: f9fe79ec45febec900d21f62269f4352cc1a97a2
2019-01-17 00:01:26 +01:00
65d4c5aab7
Included control for user set filter and admin set filter
...
Former-commit-id: fe0ae14537a558e8f3ce423fd761a653ff8168e7
2019-01-16 17:53:32 +01:00
ab13faa788
Merge remote-tracking branch 'origin/develop' into pandora_enterprise#2987
...
Former-commit-id: 8d8324be8f876974cc0e33f18e9f0a93a6aff1a8
2019-01-16 17:49:10 +01:00
45becfe9ad
Merge branch '3046-Fallos-en-edicion-de-usuario' into 'develop'
...
3046-Fallos-en-edicion-de-usuario
See merge request artica/pandorafms!1947
Former-commit-id: bff6a1068784bb6ded8adec78f7458285f742368
2019-01-16 12:26:27 +01:00
b2434229db
Merge branch '1851-Grafica_de_widget_de_WUX_se_descoloca_si_falla_la_primera_fase' into 'develop'
...
fixed error widgets wux
See merge request artica/pandorafms!2102
Former-commit-id: c47bc3fc71f671b9ae4d668a6f81711683bb43a2
2019-01-16 11:03:02 +01:00
fe13a117aa
Auto-updated build strings.
...
Former-commit-id: 04682af4f07a1cb2bae17db88c4a4f4e17ad5600
2019-01-16 00:01:27 +01:00
2e8e911ca7
added safe_input to custom_fields - value while storing them in db
...
Former-commit-id: e06e141883d87a7247a6426a75c03c7df6045e9b
2019-01-15 18:22:55 +01:00
a84db4d88f
Merge remote-tracking branch 'origin/develop' into ent-3328-7200-correcciones-consola-vmware
...
Former-commit-id: b09a410d415480efd4bcf6c387347e2e582febeb
2019-01-15 18:22:27 +01:00
f485b2f436
Merge branch 'ent-3380-Parametro-API--en-creacion-de-eventos-no-funciona-con-encoding-HTML-en-v730' into 'develop'
...
Fixed bug in functions_api
See merge request artica/pandorafms!2125
Former-commit-id: ee373ced704fd3162d6c72d9dd68aff2d5106674
2019-01-15 17:03:55 +01:00
aabcf73210
Fixed bug in functions_api
...
Former-commit-id: 28e5d9cf323dd04432ca5cabcd447e8cbf748706
2019-01-15 16:33:52 +01:00
797b49c03d
Merge branch '313-Respuestas-de-evento-masivas' into 'develop'
...
ent-313-Respuestas-de-evento-masivas
See merge request artica/pandorafms!2121
Former-commit-id: c4cf56f0b2526158d8f7f67ab3417e46b6e0f003
2019-01-15 16:17:53 +01:00
6ba8b9ab9a
Merge branch '2299_Añadir_nueva_funcionalidad_en_el_CLI_remove_agent_from_policy' into 'develop'
...
2299 añadir nueva funcionalidad en el cli remove agent from policy
See merge request artica/pandorafms!2092
Former-commit-id: d9ef39c8571ab3558e76883e1afc9cbb00225c79
2019-01-15 14:37:08 +01:00
9048a13840
fix bug: in progress events deleting on event view massive deletion
...
Former-commit-id: 4c4f0a387ad3abd7cfea913b45c885ab3af4ecc6
2019-01-15 13:27:14 +01:00
b38dc64ad8
Merge branch '3134-Tardanza_a_la_hora_de_aplicar_cambios_masivamente' into 'develop'
...
fixed errors in massive operation edit modules
See merge request artica/pandorafms!2101
Former-commit-id: 5c3a995d57b344ec860679b07b3624aec73cf4b8
2019-01-15 12:35:11 +01:00
5235b62c0d
fix disable actions in event list when centralized mode is enabled
...
Former-commit-id: d5f16b4453b1e291ba051cd381fc6c09ce0bd027
2019-01-15 11:29:12 +01:00
1ed90180c9
disable actions in event list when centralized mode is enabled and improve behavior of checkboxes when a massive action is applied
...
Former-commit-id: 11f4606d2e7dd9b91c918323dc8a3dada0c8f765
2019-01-15 11:27:05 +01:00
6894623429
Auto-updated build strings.
...
Former-commit-id: 582bbf87e0972212cf48dc220871981f80974321
2019-01-15 00:01:25 +01:00
f68cc53bb2
Merge branch '2896-Vista-de-monitores-en-metaconsola' into 'develop'
...
first load it does not show the data
See merge request artica/pandorafms!2112
Former-commit-id: 5f88566e4123c079956274ac4f7db27316e11718
2019-01-14 19:21:01 +01:00
24260cea34
Merge branch 'ent-2753-meter-profiler-en-el-docker' into 'develop'
...
Added profiller to docker
See merge request artica/pandorafms!1966
Former-commit-id: 24ade418bbc05cc6a40ee6f988b53eb648fffec5
2019-01-14 14:59:50 +01:00
efa2e5332f
fix massive custom event responses
...
Former-commit-id: 24db40167b05bfd7fe4de88060f03a7a0ec38e73
2019-01-14 13:40:49 +01:00
5a8e46d608
modify the way event responses are executed in event list
...
Former-commit-id: 14ef545eef10427d95f96484e8d6b8d9656bd53c
2019-01-14 12:10:43 +01:00
98c0bbec9a
Merge branch 'ent-2570-6239-ldap-grupos-secundarios' into 'develop'
...
Ent 2570 6239 ldap grupos secundarios
See merge request artica/pandorafms!2110
Former-commit-id: f710fa17c372e5dde1401d5cafa47a3e4ac56711
2019-01-14 10:53:45 +01:00
ad9a316a47
Auto-updated build strings.
...
Former-commit-id: 3426e636c31a7a9dcea09e442811310a4956d6ce
2019-01-14 00:01:23 +01:00
20a0aefe84
Auto-updated build strings.
...
Former-commit-id: aab4a872f690f104fe10dbdf7ef8ba86e02daef8
2019-01-13 00:01:23 +01:00
5abf8e14ff
Auto-updated build strings.
...
Former-commit-id: f78ab7f528f841aeda3dd7e28b1a2fcb34c9a05e
2019-01-12 00:01:24 +01:00
c3481933f5
Merge branch 'ent-3365-Javascript_roto_en_creacion_de_modulos' into 'develop'
...
fixed error create modules network
See merge request artica/pandorafms!2117
Former-commit-id: c522eeb2ded1442adb9a1282d350c9514e9ffa3f
2019-01-11 13:06:31 +01:00
5ead23014d
Add traps, and other intracom API functions - #2978
...
Former-commit-id: 6f4029434a36030206def701df0d6e66995c6ca3
2019-01-11 12:33:22 +01:00
197884fe6d
Merge branch 'revert-2f87cc61' into 'develop'
...
Revert "Merge branch…"
See merge request artica/pandorafms!2118
Former-commit-id: cf34512787f384d097b4dcda51928ab9cd6024b8
2019-01-11 12:16:33 +01:00
1865cc954c
Revert "Merge branch…"
...
This reverts merge request !1899
Former-commit-id: e19c3f43ff8a1a416e339f874d73299406d7e57a
2019-01-11 12:12:51 +01:00
54449f9fb6
Merge branch '2978-Functiones-API-traps-y-control-de-acceso-de-aplicacion-externa-Fix-de-código-pisado' into 'develop'
...
Add generic API functions set access control and traps functions - #2978
See merge request artica/pandorafms!1899
Former-commit-id: 2f87cc61363fe06c0c516ae7f6c785f8c9e2bde3
2019-01-11 12:09:17 +01:00
ae9b595edd
Merge branch 'develop' into 2978-Functiones-API-traps-y-control-de-acceso-de-aplicacion-externa-Fix-de-código-pisado
...
Conflicts:
pandora_console/include/functions_api.php
Former-commit-id: 5a5debe1ed66000fb8569ec589c84cad8e8dfe63
2019-01-11 12:04:50 +01:00
4e6cf0182a
fixed error create modules network
...
Former-commit-id: 4be4cbd7e796680772faada72504ed751b91cc36
2019-01-11 12:01:48 +01:00
ea34cc3b16
Auto-updated build strings.
...
Former-commit-id: 0d164597ba66950d16573ad8b618164c24b578d1
2019-01-11 00:01:25 +01:00
f14acf12d2
Merge branch '1931_Cambiar_el_cuerpo_del_email_al_enviar_reportes' into 'develop'
...
Be able to change the subject and body of the report message when necessary
See merge request artica/pandorafms!1925
Former-commit-id: 18ef1606525fd0cf1ecd692fd156e3fd72f7ca43
2019-01-10 14:49:18 +01:00
00523128cf
Auto-updated build strings.
...
Former-commit-id: ea896e01eeba9faf882c98c4dbaa788b58d46f7b
2019-01-10 00:01:25 +01:00
07dc9a0b84
first load it does not show the data
...
Former-commit-id: 417e37dfb7acd78f3fb9e379a62534ca611aa9b1
2019-01-09 12:27:22 +01:00
8d3644b002
Merge branch '3112-Bug-en-creacion-de-alertas-en-cluster' into 'develop'
...
fix duplicated table in active-passive cluster's alert builder
See merge request artica/pandorafms!2010
Former-commit-id: 5b92294a64c3ba4baa65f6eba4087edebd450ed9
2019-01-09 10:34:30 +01:00
4f7733d8e8
Merge branch '2923-unit-y-post-process-no-se-guardan' into 'develop'
...
fixed bug: failing load of post process and unit fields in plugin component in module creation
See merge request artica/pandorafms!1912
Former-commit-id: 659495290305079e9932ab60b5fef924ef6089ed
2019-01-09 10:31:44 +01:00
344e5f1a6f
Auto-updated build strings.
...
Former-commit-id: a2919ff8afe0b64b756cc60b01a3145a02c8606a
2019-01-09 00:01:23 +01:00
f0c0a86533
LDAP no hierarchy groups on node functionallity
...
Former-commit-id: a9fe31be70e178e190c0d0bacf1dd6e27e71f03b
2019-01-08 16:42:23 +01:00
6e90172b59
Merge branch '2919-Bug-en-la-ayuda-de-plugin-en-la-creacion-de-un-modulo-de-tipo-plugin' into 'develop'
...
fixed english and spanish version of plugin-in macros help dialog
See merge request artica/pandorafms!1895
Former-commit-id: daf5cfd2aabda3284139069d403a6c327eeb682e
2019-01-08 15:38:07 +01:00
561579580e
Merge branch '2958-Bug-en-filtrado-de-módulos-en-la-creación-de-alertas' into 'develop'
...
Added parameter width id agent - #2958
See merge request artica/pandorafms!1891
Former-commit-id: 3288ce807e8ab67daab9d6f4795a263c8467bc7f
2019-01-08 13:38:35 +01:00
0445e212fe
Added default_no_hierarchy to config global variable
...
Former-commit-id: 0daba928d7adc7a848bca04b04168d05a82ea609
2019-01-08 12:54:32 +01:00
669c74c3dd
Merge branch '2838-Vista-detalle-módulo-en-tree-view' into 'develop'
...
Removed text for modules with images - #2838
See merge request artica/pandorafms!1945
Former-commit-id: f9e95e0bf3262b8783c6b48927522d12d1edc2bf
2019-01-08 12:18:36 +01:00
7300f83552
Merge branch '2955-Group-view-cuenta-módulos-de-agentes-deshabilitados' into 'develop'
...
Added disabled field in sql query - #2955
See merge request artica/pandorafms!1893
Former-commit-id: 2eaba1884722b5294698620f9ca0464b12c7bd33
2019-01-08 12:17:09 +01:00
0cb7aa3d0e
Merge branch '3047-Error-en-etiqueta-en-gráficas-horizontales' into 'develop'
...
Changed the font styles of the labels - #3047
See merge request artica/pandorafms!1982
Former-commit-id: 48a5230053344368f5858192e6eb3a4d7c42c830
2019-01-08 12:15:05 +01:00
Daniel Rodriguez
Alejandro Fraguas
artica
Kike
fbsanchez
Manuel Montes
alejandro-campos
fermin
daniel
enriquecd
Enrique Camargo
Samuel Carcases
danielmaya
Tatiana Llorente