e2471b376c
Auto-updated build strings.
...
Former-commit-id: 6c89b359049f06338695df7e9cabd3293885df10
2019-01-21 00:01:23 +01:00
14c5e9d48b
Auto-updated build strings.
...
Former-commit-id: 1eb9179a088600ca4e68930cf9e903997d8f20c7
2019-01-20 00:01:23 +01:00
5a75662b99
Auto-updated build strings.
...
Former-commit-id: 8eff24974e5b3cfbeb57d408c2d4817fe0cb7156
2019-01-19 00:01:25 +01:00
b3011e419a
Merge branch '3156-Translate-string-no-funciona' into 'develop'
...
fixed bug in function __()
See merge request artica/pandorafms!2023
Former-commit-id: 5fbbb662fdb7a044a3c616521158bcfa24e50413
2019-01-18 13:37:11 +01:00
979a87762e
Auto-updated build strings.
...
Former-commit-id: 56c567b92e7aad5a2aabd6551b3aa2f07517fb0b
2019-01-18 00:01:26 +01:00
3e25008c9f
Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan
...
Former-commit-id: b12bfcf0f580e011d1fa9ac9fab18d108b403b0a
2019-01-17 15:50:00 +01:00
1c8d846574
WIP IPAM Supernet
...
Former-commit-id: 9da8df381292bc79a49c1416fc6d2820f4b814ac
2019-01-17 15:49:41 +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
6bf6fd19d6
Auto-updated build strings.
...
Former-commit-id: f9fe79ec45febec900d21f62269f4352cc1a97a2
2019-01-17 00:01:26 +01:00
6e8e5d0dd6
Fixed Event reports pie graphs in metaconsole
...
Former-commit-id: 6fe0eb4035200dc4e22736098b810f31194e1a45
2019-01-16 19:44:29 +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
c0398dfa5b
Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan
...
Former-commit-id: 8cfa910f14527759459b667c2d9b1303472c30ca
2019-01-16 08:41:50 +01:00
fe13a117aa
Auto-updated build strings.
...
Former-commit-id: 04682af4f07a1cb2bae17db88c4a4f4e17ad5600
2019-01-16 00:01:27 +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
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
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
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
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
16ecc4efa3
Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan
...
Former-commit-id: 069f3fb28862a06eba76132c5e31da24ecf54b05
2019-01-11 13:12:35 +01:00
5ead23014d
Add traps, and other intracom API functions - #2978
...
Former-commit-id: 6f4029434a36030206def701df0d6e66995c6ca3
2019-01-11 12:33:22 +01:00
1865cc954c
Revert "Merge branch…"
...
This reverts merge request !1899
Former-commit-id: e19c3f43ff8a1a416e339f874d73299406d7e57a
2019-01-11 12:12:51 +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
b963395d01
fixed errors
...
Former-commit-id: 813a875e0f3d0dc3c1097ced987a5a45e8051046
2019-01-11 08:45:12 +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
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
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
02b497c250
Auto-updated build strings.
...
Former-commit-id: 32c035216be628177ecd430d3c875e3dd504dccc
2019-01-08 00:01:27 +01:00
dd922c41fc
Auto-updated build strings.
...
Former-commit-id: bb71b724086140b69a1314f914508cdbd2fc7776
2019-01-07 00:01:28 +01:00
48f1196400
Auto-updated build strings.
...
Former-commit-id: 17e276d76c3ee7afa9866f8268d6dcb120485a0b
2019-01-06 00:02:00 +01:00
cf1d28cf8b
Auto-updated build strings.
...
Former-commit-id: ed5de54f4a19cf94fad2d6978c0229928edcec6e
2019-01-05 00:01:24 +01:00
cfdde23d96
Auto-updated build strings.
...
Former-commit-id: 051d9c9f6f96c740c40cf8afc900125ab5ec80e9
2019-01-04 00:01:27 +01:00
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
361b85efb8
Merge branch 'ent-3332-fallo-al-filtrar-por-grupos-en-prediction-module' into 'develop'
...
Fixed agents_get_group_agents while trying to get agent list from target group
See merge request artica/pandorafms!2107
Former-commit-id: 5c036aa603fbd341617b065dfa6bb870f652775e
2019-01-03 14:34:26 +01:00
d114a77151
Auto-updated build strings.
...
Former-commit-id: c0c7f09435de019d1dc0057f48f4e5fd964fb3da
2019-01-03 00:01:25 +01:00
5c16c08d59
Auto-updated build strings.
...
Former-commit-id: 1ce399660dc1fddf4ac163fdd4b7657cef8b6594
2019-01-02 00:01:25 +01:00
ff9f6549d4
Auto-updated build strings.
...
Former-commit-id: 9cd8d22d6cab6e4edaad7c4b184ec4bb4995b54f
2019-01-01 00:01:24 +01:00
5139308723
Auto-updated build strings.
...
Former-commit-id: c78a0fd88b9100d3865413eb017d4dc0d8816b4c
2018-12-31 11:24:46 +01:00
4356a8ce8e
Auto-updated build strings.
...
Former-commit-id: 2971785cc199543f9d8e0e7fed646ec7aabd29d9
2018-12-31 00:01:23 +01:00
5e8b4b4500
Auto-updated build strings.
...
Former-commit-id: f8005483f902558687e92a128c3c138d1323b141
2018-12-30 00:01:22 +01:00
60617def24
Auto-updated build strings.
...
Former-commit-id: 5f0ff76fb4c03a0177dd9bb4b66609229cfec0b6
2018-12-29 00:01:35 +01:00
0686982055
Fixed agents_get_group_agents while trying to get agent list from target group
...
Former-commit-id: 8a005e1574760688f5823cc854a287774c8c828b
2018-12-28 13:09:37 +01:00
ac228a7fad
fixed error in massive operation
...
Former-commit-id: 691f3557d44c686645cfa634eab3630d060def33
2018-12-28 12:14:17 +01:00
2260e8d82a
Merge branch 'ent-3326-7195-no-se-pueden-eliminar-elementos-de-modulo-sintetico-aritmetico' into 'develop'
...
minor fix in control messages format and processing
See merge request artica/pandorafms!2105
Former-commit-id: cc9453bfcf71cf47c8571ba338c84a5f87f0e70b
2018-12-28 11:48:56 +01:00
fcfd68f102
Auto-updated build strings.
...
Former-commit-id: 9885d1113e1e998bdb8c1d93d636c33f3dcc43c1
2018-12-28 00:01:26 +01:00
c6b9122cfc
minor fix in control messages format and processing
...
Former-commit-id: bda61b3e6d6ef74090c215f9aa9d2f3db42456bd
2018-12-27 19:16:56 +01:00
a789b3350e
fixed minor error pie chart
...
Former-commit-id: e335f96e7538f939c2fd20137c19c354125f0edb
2018-12-27 10:35:31 +01:00
2043546c52
Auto-updated build strings.
...
Former-commit-id: 58052cc9973e0315e5a3b470d0514a2fcff3d418
2018-12-27 00:01:25 +01:00
5377cf6039
Auto-updated build strings.
...
Former-commit-id: fec5c338a7ebb5e8c86ba8cab22102dde9945978
2018-12-26 00:01:25 +01:00
34502da313
Auto-updated build strings.
...
Former-commit-id: 4bd0f17766d00bdbc9761346e7f13d1959df61e8
2018-12-25 00:01:28 +01:00
ee7ff52a04
fixed error widgets wux
...
Former-commit-id: 149cfea6dc0d427b57f05594214374d220111031
2018-12-24 14:25:19 +01:00
7de36e1631
Merge branch '3257-No_se_ven_graficas_en_plantillas_de_informes_de_availability_SLA' into 'develop'
...
fixed error template availability
See merge request artica/pandorafms!2086
Former-commit-id: 94d91ceb98a78fc09a3d6af4e26baeba12343901
2018-12-24 09:23:35 +01:00
86b1a3e424
Auto-updated build strings.
...
Former-commit-id: ea35f14b67818e50e90f81c0f4daea2c77fdaeae
2018-12-24 00:01:23 +01:00
c5d4f395f2
Auto-updated build strings.
...
Former-commit-id: ab48062df957894db4ac37d0bc209c75eb12512a
2018-12-23 00:01:25 +01:00
cba18381bd
Auto-updated build strings.
...
Former-commit-id: 32fc309340e7c464585f9ab5a459e40938176ce5
2018-12-22 00:01:28 +01:00
b0b7e812f3
Merge branch '2315_Redireccion_consola_visual_Meta' into 'develop'
...
Fixed link in static graph
See merge request artica/pandorafms!1957
Former-commit-id: 5e68fabf271505484c336300cb5bffe8fb01fc9c
2018-12-21 11:36:50 +01:00
dd0165fe89
Merge branch '3042-Punto-de-inyeccion-sql' into 'develop'
...
avoid sql injection in visual_map_get_user_layouts function
See merge request artica/pandorafms!1951
Former-commit-id: cd680e3a3df45f6f54c6c2f25d118f97f30b8b81
2018-12-21 10:29:31 +01:00
2d00336682
Merge branch '3114_Error_en_reportes_de_tipo_ITIL_y_tipo_Modulo' into 'develop'
...
Fixed function report_value in reports
See merge request artica/pandorafms!1998
Former-commit-id: 6456c469f1e94ccaf49a0272f0f76e30b0ee6f0f
2018-12-21 10:28:52 +01:00
33f014695d
Merge branch '3057-Agregar-token-barras-desplazamiento-en-vista-datos-de-modulo' into 'develop'
...
Fixed overflow in module data view
See merge request artica/pandorafms!1967
Former-commit-id: bfcf0c9c08953e1fa49e8731db808bc78ecc826b
2018-12-21 10:23:29 +01:00
411c815f19
Merge branch '3096-Error-exportar-a-CSV-en-Graph-Container' into 'develop'
...
Removed unnecessary loop - #3096
See merge request artica/pandorafms!1992
Former-commit-id: 0708e60e64cd10bc27e3841f718fa64d8513b97c
2018-12-21 10:23:09 +01:00
4f43396d81
Merge branch '3151-Fallo-jquery-en-consola-mobile' into 'develop'
...
fixed bug: pie graph not showing in mobile's tactical view dashboard widget
See merge request artica/pandorafms!2027
Former-commit-id: d3a814853a43ea8c6c5c621893a4eaaac3e7d401
2018-12-21 10:22:41 +01:00
2a407bb494
Merge branch '3253-Error_en_automatic_combined_graph_en_meta_con_varios_nodos' into 'develop'
...
fixed autocombined report metaconsole
See merge request artica/pandorafms!2077
Former-commit-id: 130262742f8bac0441b4b8285dc62bb0d3aa998a
2018-12-21 10:22:21 +01:00
8c38ab63da
Merge branch '3269-Errores_informe_availability_graph' into 'develop'
...
fixed errors in availability reports
See merge request artica/pandorafms!2088
Former-commit-id: 9497860a73fe05a656cc19423af8d9dce3f60d53
2018-12-21 10:18:24 +01:00
2d08c75bae
Auto-updated build strings.
...
Former-commit-id: c0f17d266dcf7dc801aa210e5a90cd16b6090145
2018-12-21 00:01:27 +01:00
9531065dbe
Merge branch 'develop' into ent-2753-meter-profiler-en-el-docker
...
Former-commit-id: da01f6f0f7f223755a6c2a72cadafac075b6a3c0
2018-12-20 18:17:57 +01:00
8c20c93806
Auto-updated build strings.
...
Former-commit-id: e8875f49f492708eca311bb984fe05fc9e766ea7
2018-12-20 00:01:29 +01:00
5c4ad3e845
Merge branch 'develop' into 3114_Error_en_reportes_de_tipo_ITIL_y_tipo_Modulo
...
Conflicts:
pandora_console/include/functions_reporting.php
Former-commit-id: b379a4c9d87c3dc7404ccde8ee9a279138f73e3b
2018-12-19 19:45:11 +01:00
8a6033e002
Auto-updated build strings.
...
Former-commit-id: deb6afebc4c6aa5a75442e984da3f173283f21e1
2018-12-19 00:02:06 +01:00
ccb4778217
implemented api functions to create/update/delete/list event filters
...
Former-commit-id: f6b5c092622d74dee4fd587f259e6c286cd9c180
2018-12-17 18:18:17 +01:00
a9d3d81757
Fixed api function
...
Former-commit-id: 9b376941609b04ac13da551e8253d5ed5a8085dc
2018-12-17 17:56:01 +01:00
58289e73bc
Added new functionality for CLI to delete policy agents.
...
Former-commit-id: 753f9c47d2a4ffe8e5eb599dbd41d5b851500164
2018-12-17 17:51:30 +01:00
225635a774
fixed errors in availability reports
...
Former-commit-id: 0783d9b68bf5f3373579db9f0b09e7506d95ea84
2018-12-17 13:20:57 +01:00
b530447474
Added token metaconsole_deploy_inventory_plugin in functions_config
...
Former-commit-id: 9d819bb43ba4ce7869480411ae6f6cb9f1edbcce
2018-12-17 12:09:05 +01:00
84a0f227b9
fixed error template availability
...
Former-commit-id: 249e476d8fa4394fda0cf5df01b7b14dca8d2bea
2018-12-17 11:24:44 +01:00
7f9ee21b4b
Auto-updated build strings.
...
Former-commit-id: 95dbb73cfdfe00b7123c380c2ce5803bdd2aa754
2018-12-17 00:01:27 +01:00
e1bce89923
Auto-updated build strings.
...
Former-commit-id: a06da6638acbded07658431115057953bdcf417c
2018-12-16 00:01:25 +01:00
7af8f01b59
Auto-updated build strings.
...
Former-commit-id: 67927d3968e9d40047b1a55468ea138c768abc3d
2018-12-15 00:01:28 +01:00
632d67095b
List alert actions in nodes with CLI and API
...
Former-commit-id: 11e9a8137a2a37b081fcbac2ee50cac27c2c208b
2018-12-14 17:20:46 +01:00
f2f88579fa
Merge branch 'ent-2997-color-cloud-vc-items' into 'develop'
...
Added a pending translation
See merge request artica/pandorafms!2083
Former-commit-id: 2ea6499b990e08750210593f2b4882044da392ed
2018-12-14 10:21:40 +01:00
b26d13db54
Auto-updated build strings.
...
Former-commit-id: d07fdc3ff61ce6a947f38d250f6714124fe127d1
2018-12-14 00:01:32 +01:00
b06790cc1a
Merge remote-tracking branch 'origin/develop' into 3177-Send_custom_report
...
Former-commit-id: 3bb953eb2b06d3c827093a0648c722c5281d73d5
2018-12-13 17:24:10 +01:00
807f7a0b74
fixed minor error
...
Former-commit-id: e855d814160365c0b6f53d15ea40b3c1bed16890
2018-12-13 17:24:01 +01:00
d8285c0ca2
Added a pending translation
...
Former-commit-id: 6272217de4eb47fe70eac214bf50b34da6aa20bb
2018-12-13 16:49:31 +01:00
6839559eb5
Merge branch 'ent-2997-color-cloud-vc-items' into 'develop'
...
Error fixes and metaconsole support for the color cloud item of the VC
See merge request artica/pandorafms!2082
Former-commit-id: 445dbc16ce84f22ffb1d379c8539b7ec35c9e478
2018-12-13 15:42:48 +01:00
06a68d01be
Error fixes and metaconsole support for the color cloud item of the VC
...
Former-commit-id: 01b0045b76c41dc2c0f3145631fbd0beae3b16df
2018-12-13 15:36:01 +01:00
artica
Alejandro Fraguas
daniel
Daniel Rodriguez
samucarc
manuel.montes
alejandro-campos
fermin
enriquecd
Enrique Camargo
Samuel Carcases
Tatiana Llorente
fbsanchez
vgilc
danielmaya
Alejandro Gallardo Escobar