36dd59b250
Added changes without delete install.php
...
Former-commit-id: 686b0dc8e519283508f8f83ff663f6d3b79e7b80
2019-02-12 13:29:43 +01:00
af90734436
Revert "Merged from discovery and validated"
...
This reverts commit e744dd50eb
2019-02-12 13:29:04 +01:00
e744dd50eb
Merged from discovery and validated
...
Former-commit-id: af2047a38913f2763b68a8ec15b8f0cd58b8e676
2019-02-12 13:14:22 +01:00
166c3bbe88
Merge remote-tracking branch 'origin/ent-3430-discovery' into ent-3371-sistema-de-notificaciones-pandora
...
Former-commit-id: d630994f964e43b28197f4d26469fa1484d08ac2
2019-02-12 12:41:11 +01:00
42dc0c60be
supervisor
...
Former-commit-id: cf99e746a02ab3e921a39b19f6b4822580299b7e
2019-02-12 11:41:21 +01:00
17c012cd83
Added update ball notifications
...
Former-commit-id: 60c253a1b64d1084ae732e88e0a6fb1f98cf8a12
2019-02-11 14:44:14 +01:00
a50a251b00
Added filter to get last messages by notification ball
...
Former-commit-id: 57619fe6cd46f3f723c5b2c3bdbe3aa9ba155a0c
2019-02-11 13:35:36 +01:00
4b86683d23
Fixed style
...
Former-commit-id: bd4c0370bb3c63eddb9a7b36b0e8f6938c48b4ae
2019-02-08 11:39:17 +01:00
80a5d0b0b9
Removed unused code and format some files
...
Former-commit-id: 5f8da31efc5241dd16002565fdb89d774072b7b3
2019-02-08 10:32:04 +01:00
04b2cb8665
Use real ids instead fake ids
...
Former-commit-id: 2360a14d1865f918247d23b2f3181626052cad60
2019-02-07 18:04:14 +01:00
7fa344c2a4
Change the global configuration notification to AJAX
...
Former-commit-id: a9017377c8ed6780170c0f418ec3e9bc39f7782c
2019-02-07 17:53:09 +01:00
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
6ddcfcbb19
Fixed code style lintern
...
Former-commit-id: d7757a56f8368761776f80f826600d601b56b6d9
2019-02-06 12:51:02 +01:00
ddcf0bbd16
Added deletion on global notification config
...
Former-commit-id: 2356bbe374e5decf929cfaaf2fc4776611b0652d
2019-02-05 18:14:10 +01:00
7df3fe2dac
Added functionallity to Add element on notification global config
...
Former-commit-id: b51cf2d5079019a69fd7c4344dfcff2bf38147db
2019-02-05 17:40:44 +01:00
b4f3e94b13
Clean dialog box on creation
...
Former-commit-id: 824f7a968b2e196d6df98b9f5dbd48f21a7c9859
2019-02-05 15:31:08 +01:00
68bdbd511c
Fixed add consecutive source elements
...
Former-commit-id: 7763da94a48442953879538d42f36673fbdec752
2019-02-05 13:46:16 +01:00
8811257762
Popup to add groups and sources to global notification configuration
...
Former-commit-id: 481812290ea1d1446aa7378ab6a935139483c8a0
2019-02-05 13:36:16 +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
54f0bc1a03
Disable selec boxes when click notify all users on notifications global config
...
Former-commit-id: 93a3a0007a3a8dfabfec5d0b9ead7d185aeee81b
2019-02-04 11:02:52 +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
d2a3d3bbbc
Added all users in global notifications config
...
Former-commit-id: d4bf0067f3ffe2e4fdef25158579716bdfd78d5d
2019-02-04 10:41:35 +01:00
d38236091b
Format fixes
...
Former-commit-id: 58823652a8bda566d0b0e340a1249abb4f7f219e
2019-02-01 09:55:29 +01:00
1c0a5ca247
Added pospone select (fixme)
...
Former-commit-id: 428b4424a15ef54c4d95a2eb4af07a334366577a
2019-01-31 20:11:43 +01:00
75eaa875c9
Added checkboxes to notifications global configuration
...
Former-commit-id: 79df159f003292dfef697773fe8daa25b77f04c2
2019-01-31 19:43:13 +01:00
01bc0775bc
Added notification global configuration (only enable and disable)
...
Former-commit-id: 850d4dd1d8e30fc66623308b8ab148eaeadb5015
2019-01-31 19:13:51 +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
fermin831
fbsanchez
Tatiana Llorente
manuel.montes
Alejandro Gallardo Escobar
artica
Daniel Rodriguez
daniel
Samuel Carcases
Alejandro Campos
vgilc