4c2215a3db
Merge remote-tracking branch 'origin/develop' into 3446-Imagen-grupos-no-se-muestra-None
...
Conflicts:
pandora_console/install.php
Former-commit-id: bc20f50737c115ade0034b4ca9e6d4cab26d35e6
2019-02-07 08:59:45 +01:00
b8aab972c9
Merge remote-tracking branch 'origin/develop' into 3446-Imagen-grupos-no-se-muestra-None
...
Conflicts:
pandora_console/godmode/groups/group_list.php
Former-commit-id: 6f928cc0a3ce2d4822affc7444254393d1d47b69
2019-02-06 15:14:22 +01:00
9baa3dcfa2
Merge remote-tracking branch 'origin/develop' into 3358-Mejora-en-la-aplicación-de-estilos
...
Conflicts:
pandora_console/extensions/agents_modules.php
pandora_console/extensions/module_groups.php
pandora_console/general/login_page.php
pandora_console/godmode/alerts/alert_list.builder.php
pandora_console/godmode/alerts/alert_list.list.php
pandora_console/godmode/gis_maps/configure_gis_map.php
pandora_console/godmode/groups/group_list.php
pandora_console/godmode/reporting/visual_console_builder.data.php
pandora_console/godmode/reporting/visual_console_builder.editor.php
pandora_console/godmode/reporting/visual_console_builder.elements.php
pandora_console/godmode/setup/setup_visuals.php
pandora_console/include/chart_generator.php
pandora_console/include/functions_networkmap.php
pandora_console/include/functions_pandora_networkmap.php
pandora_console/include/functions_ui.php
pandora_console/include/functions_visual_map_editor.php
pandora_console/include/styles/common.css
pandora_console/include/styles/countdown.css
pandora_console/include/styles/datepicker.css
pandora_console/include/styles/dialog.css
pandora_console/include/styles/help.css
pandora_console/include/styles/menu.css
pandora_console/include/styles/pandora.css
pandora_console/include/styles/pandora_forms.css
pandora_console/operation/agentes/estado_monitores.php
pandora_console/operation/agentes/interface_traffic_graph_win.php
pandora_console/operation/agentes/realtime_win.php
pandora_console/operation/agentes/stat_win.php
pandora_console/operation/events/events.php
pandora_console/operation/snmpconsole/snmp_view.php
pandora_console/operation/tree.php
pandora_console/operation/visual_console/render_view.php
Former-commit-id: 87793fc5a319121753f591da7949ad0ff3bd72b1
2019-02-05 09:23:53 +01:00
0a94ac9eb0
Merge branch 'develop' into ent-3338-Bulk-operations-Module-operations
...
Conflicts:
pandora_console/godmode/massive/massive_operations.php
Former-commit-id: b673fb9521259653d6f0386e6d9ab5add276380f
2019-02-04 11:00:50 +01:00
d38236091b
Format fixes
...
Former-commit-id: 58823652a8bda566d0b0e340a1249abb4f7f219e
2019-02-01 09:55:29 +01:00
b3da2803a4
Changed the format of the .php files
...
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
7a9684f23c
Changed the format of the .css files
...
Former-commit-id: a0dce3fe780031105396a8439c83d520197670af
2019-01-30 12:42:16 +01:00
dc238cf74a
Changed the format of the .js and .html files
...
Former-commit-id: 7a06315787b85355f4840cbfb0431d55dea4293d
2019-01-30 12:27:18 +01:00
7bc5fb47a0
Don't show image for groups without icon - #3446
...
Former-commit-id: 6a67e368a2aef7f2df04a3937a0466064fa6894e
2019-01-28 17:06:35 +01:00
f5c96b7e5d
New organization of CSS files - #3358
...
Former-commit-id: 8512adc7742eecb64db2b0ee539acfddd33406c2
2019-01-24 11:10:49 +01:00
e8497bb80c
Changed the order of actions
...
Former-commit-id: ec733bfcf1705552f6257dc14c5a34e0a3e84e66
2019-01-22 11:03:52 +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
4e6cf0182a
fixed error create modules network
...
Former-commit-id: 4be4cbd7e796680772faada72504ed751b91cc36
2019-01-11 12:01:48 +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
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
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
a96606088a
Merge branch 'Tipo_de_datos_en_Module_Data_server' into 'develop'
...
Removed Web Analysis and Log4x from data server module
See merge request artica/pandorafms!1985
Former-commit-id: 53756c67551aba928a0bb545386eceeb870fc8d0
2019-01-04 16:52:28 +01:00
ac228a7fad
fixed error in massive operation
...
Former-commit-id: 691f3557d44c686645cfa634eab3630d060def33
2018-12-28 12:14:17 +01:00
fc5d3170b5
fixed warn/err messages in module_manager_editor
...
Former-commit-id: d3a30dd591470a177709b60d82041b8c21f4cce1
2018-12-28 11:57:16 +01:00
17e773adcb
Merge remote-tracking branch 'origin/develop' into 3325-Desaparicion_de_los_desplegables_en_module_component_al_crear_un_modulo
...
Former-commit-id: 9d128ea51bb2bf42c6d97c4f6b8378457028dae9
2018-12-28 11:54:12 +01:00
c6b9122cfc
minor fix in control messages format and processing
...
Former-commit-id: bda61b3e6d6ef74090c215f9aa9d2f3db42456bd
2018-12-27 19:16:56 +01:00
6d8b73f72e
fix minor error module editor network
...
Former-commit-id: c0f2c03b441f939b842303186ecdf2ace5c253b6
2018-12-27 12:40:47 +01:00
c0869b3c9e
fixed error module editor
...
Former-commit-id: cf2c9325c84448222743830759bb4e2716745f75
2018-12-27 10:29:12 +01:00
7e2fb25e27
fixed errors in massive operation edit modules
...
Former-commit-id: 2d2fa21660369607e6c206d269b12d2041f74a1a
2018-12-24 08:59:23 +01:00
d4061641ec
Merge branch '3061-Mensaje-de-error-al-crear-un-modulo-sin-nombre' into 'develop'
...
fixed error message
See merge request artica/pandorafms!1964
Former-commit-id: 55944da11dcd55a19e9147bc4520431dedc3a19a
2018-12-21 10:29:14 +01:00
0ec0af6e6e
Merge branch '2980-Ajuste-de-dimensiones-en-custom-graph' into 'develop'
...
Removed the adjustment of dimensions in custom graph
See merge request artica/pandorafms!1946
Former-commit-id: ee5fe8d83c851b2ade8d8b4c6966a23116716d24
2018-12-21 10:26:47 +01:00
3fd61e8d81
Merge branch '3016-URL-Address-de-un-agente-no-funciona-link_2' into 'develop'
...
Added hint to url address input
See merge request artica/pandorafms!2099
Former-commit-id: 4b8d92593b6a1eae46f1cbb0670734fde7c90ae6
2018-12-21 10:25:04 +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
ac4d420173
Added hint to url address input
...
Former-commit-id: 5c51058ff8aea2e821bbb294034a538f040c46be
2018-12-20 13:08: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
d76612b247
Minor fix
...
Former-commit-id: 80d3a5ae66a68ea249d4afe571862b01bc71db78
2018-12-13 17:11:38 +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
6b940d07d5
Fixed
...
Former-commit-id: b22637cf04af8b09c8b274aa0f5a8d2f66e13f7c
2018-12-13 13:25:37 +01:00
efdfd7c3f4
Merge branch '2658_Operaciones_masicas_sobre_politicas_2_open' into 'develop'
...
Fixed minor error
See merge request artica/pandorafms!2079
Former-commit-id: 3eaab74701477c29e800f25eca6b163b7416b3db
2018-12-13 10:06:53 +01:00
eab744f65d
Fixed minor error
...
Former-commit-id: 2af6e231aa20216a4601a8c1a03fa6828c989448
2018-12-12 20:26:38 +01:00
1b4cd37d5f
Merge branch 'ent-2997-color-cloud-vc-items' into 'develop'
...
Add the Color Cloud item to the Visual Console
See merge request artica/pandorafms!2075
Former-commit-id: e40e442631628db94c8f21c52cd8c04a0adbb6d6
2018-12-12 17:43:39 +01:00
358532c4a8
fixed autocombined report metaconsole
...
Former-commit-id: f277a1302c0b84ca0417693673ca3da0a4956f6c
2018-12-12 16:13:31 +01:00
5d52e9f9c3
Minor fix
...
Former-commit-id: e9827e1294a995fc13deb42d701ea103cf9ad1da
2018-12-12 09:41:52 +01:00
47a547367d
Added a new item to the visual console
...
Former-commit-id: 6dcb8c9500e12932775d929646f7fdc676ee94fa
2018-12-11 19:14:14 +01:00
8088a51035
Fixed audit log
...
Former-commit-id: a78fb3fb377814a6e664fd66606cd293c8af5df3
2018-12-11 17:17:46 +01:00
e3243883f0
Fixed static graph without images creation and update previsualization
...
Former-commit-id: a3a0a7942f624d9ecb2a272560a57947be4b39a1
2018-12-11 13:56:48 +01:00
562c5c14ee
Added forgotten include
...
Former-commit-id: 78e7630eef24224f877998398c06c11ac864d261
2018-12-10 18:46:01 +01:00
4d5631d355
add safe output function to strings printed in system audit log
...
Former-commit-id: 383b5885f163d167c8944ad6dc8d66a8b4c35e51
2018-12-10 15:47:25 +01:00
a2909db631
Revert "Eliminadas entidades html de vista de auditoria"
...
This reverts commit 530017a79d
2018-12-10 13:42:29 +01:00
dd1fb00e19
Revert "Removed html entities in the audit views"
...
This reverts commit ad7610d7f1
2018-12-10 13:40:37 +01:00
0af861f5b9
fix visual console's percentile item: label color not showing and removed label from view menu
...
Former-commit-id: a19e1307b326a60bfef6441a7af0c7be2520ac6a
2018-12-05 16:25:46 +01:00
94c6144653
Changed funciton size by length in jquery - #2893
2018-12-04 15:08:17 +01:00
abdd33949d
Merge branch '2877_Mejora_audit_log' into 'develop'
...
Fixed Audit log in profiles, collections and policies
See merge request artica/pandorafms!1876
2018-12-04 08:15:42 +01:00
Tatiana Llorente
manuel.montes
Alejandro Gallardo Escobar
artica
Daniel Rodriguez
daniel
Samuel Carcases
Alejandro Campos
fbsanchez
vgilc
samucarc
fermin831