Commit Graph

987 Commits

Author SHA1 Message Date
fbsanchez 4947d2117a minor fixes networkmapclass
Former-commit-id: d8eaa2ab328d803647d365a023c3ec08efb086d3
2019-03-22 03:56:31 +01:00
fbsanchez 26d231e78c Improved user experience networkmaps
Former-commit-id: bd665ad24124b227c4aba763648e4735f61770c3
2019-03-21 20:52:01 +01:00
fbsanchez 95d2259236 Improvements. networkmap class
Former-commit-id: b2e940cbb28112fe2ac9088ce2e76fd5b48239f9
2019-03-21 16:16:53 +01:00
fbsanchez 6fb6963501 Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
Former-commit-id: 9df9a4c3a4a50e191af5167129df1352e712171e
2019-03-20 17:40:08 +01:00
Daniel Barbero Martin daf72a4bac fixed errors delete files update manager open and metaconsole
Former-commit-id: 1ebff30c092290b3e65e639d94c6920afed960c0
2019-03-20 13:35:24 +01:00
Daniel Barbero d5108efb0d fixed error update manager delete files
Former-commit-id: 88b915f9278eba5949c867ae514a104ce796aec1
2019-03-15 12:19:02 +01:00
Daniel Barbero Martin a1aa480421 add delete files in update manager
Former-commit-id: 880dfc8079e7e85fa1fcba4746927caf1a2d2c06
2019-03-14 18:04:28 +01:00
fbsanchez 750c64fbd7 Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
Former-commit-id: 8dd2601c41392e8b252b2a719d16deef5b6398c7
2019-03-13 09:52:00 +01:00
fbsanchez d7983bec4e WIP NetworkMap class
Former-commit-id: ae987e5f6f3ec0997746093d20f7dbd5758c9ff1
2019-03-12 12:05:54 +01:00
Daniel Rodriguez ae006026bf Merge branch '3243-SNMP_Browser_Wizard_no_buscan_en_el_exec_server_solo_lo_hacen_en_local' into 'develop'
fixed error in snmp browser change server

See merge request artica/pandorafms!2236

Former-commit-id: a6a45ffe82e01f49139d80e09a954cceb245ce12
2019-03-11 11:54:58 +01:00
daniel 00283a5c6a progress task list
Former-commit-id: 5b8a10cdc792e74538784ae27367bc1ca2c7bed0
2019-03-07 14:45:26 +01:00
daniel f79400ecfb Merge remote-tracking branch 'origin/develop' into ent-3498-Anadir_parametros_manualmente_en_respuestas_de_eventos_masiva
Former-commit-id: 76e5afc943bd05e89a82efbe091db42d1e0a4e8d
2019-03-07 08:32:40 +01:00
daniel d722c39393 add custom net scan
Former-commit-id: 61df342754f17b2ecfe3ad06055e9c5b73617d03
2019-03-06 17:14:32 +01:00
Daniel Maya e26c81aa6c Fixed images and reset map in networkmap
Former-commit-id: d56dc68d542aa1e4d30a3014acc53b44dc07191e
2019-03-05 15:33:27 +01:00
daniel 9d7c6854a8 fixed error in snmp browser change server
Former-commit-id: 0545012dd8526bdf4cc836af2d263af7b5ca5328
2019-03-04 15:33:36 +01:00
daniel 8780571a74 add new functionality in event response
Former-commit-id: 2cf28b95c068c40e79b8f05b212aad0f720de79b
2019-02-27 10:59:44 +01:00
samucarc 8f24c0cb18 Fixed conflict in CLI apply_policy
Former-commit-id: ab512d9c2b88cd7042d6ae065251cd116b2ea5af
2019-02-27 10:28:36 +01:00
Alejandro Fraguas 441fb979e1 Merge branch 'ent-3210-Nueva-vista-de-servicios' into 'develop'
Ent 3210 nueva vista de servicios

See merge request artica/pandorafms!2195

Former-commit-id: f29cb46b83ff0fde722f3c5e3eaf26aedf5cf327
2019-02-26 16:32:34 +01:00
alejandro-campos 7791639b35 fix bad image routes
Former-commit-id: 236701131f5c2f5b11c01b878d8a04b71f76ddd3
2019-02-26 13:31:35 +01:00
alejandro-campos db5d2ceee1 fix bad routes in services treeview
Former-commit-id: 27bfcca5a7e0f7c3929e2a1f449c0f1d318891c9
2019-02-25 17:04:07 +01:00
alejandro-campos faae9c58b3 implement services tree view
Former-commit-id: a081515f62ab210f96687577bfde60d5f6d23f23
2019-02-22 14:09:27 +01:00
alejandro-campos eb56fd566c implemented services treeview
Former-commit-id: d5d71442d0c6122ba91b160647559cdf03f55625
2019-02-22 13:07:47 +01:00
manuel 00cba4cbc9 Fixed bug in filtered modules by tag
Former-commit-id: 098d3c88a9a30fb1c38074e741f093ff40fd5d02
2019-02-19 13:05:31 +01:00
samucarc 6a9e69adb1 Added changes
Former-commit-id: 0d0de6dba065aaaa5bbfc4b9f9790e4ef1b92b7d
2019-02-13 12:21:31 +01:00
Tatiana Llorente 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
artica 7a9684f23c Changed the format of the .css files
Former-commit-id: a0dce3fe780031105396a8439c83d520197670af
2019-01-30 12:42:16 +01:00
artica dc238cf74a Changed the format of the .js and .html files
Former-commit-id: 7a06315787b85355f4840cbfb0431d55dea4293d
2019-01-30 12:27:18 +01:00
tatiana.llorente@artica.es f5c96b7e5d New organization of CSS files - #3358
Former-commit-id: 8512adc7742eecb64db2b0ee539acfddd33406c2
2019-01-24 11:10:49 +01:00
alejandro-campos 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
alejandro-campos 5a8e46d608 modify the way event responses are executed in event list
Former-commit-id: 14ef545eef10427d95f96484e8d6b8d9656bd53c
2019-01-14 12:10:43 +01:00
Alejandro Campos 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
fbsanchez c6b9122cfc minor fix in control messages format and processing
Former-commit-id: bda61b3e6d6ef74090c215f9aa9d2f3db42456bd
2018-12-27 19:16:56 +01:00
Alejandro Gallardo Escobar 3c317c182d Default value given to a textPath's startOffet attribute to fix an error 2018-12-04 16:42:19 +01:00
Alejandro Gallardo Escobar a4f2a65e3a Fixed the initial zoom and center of the networkmaps 2018-12-03 16:12:43 +01:00
vgilc 48c83430ec Merge branch '3071_Fallo_en_mapa_GIS' into 'develop'
Fixed error in agent table in GIS map

See merge request artica/pandorafms!1970
2018-11-30 13:05:10 +01:00
daniel 726cabb578 fixed minor error jquery 2018-11-23 10:47:57 +01:00
daniel 2eb47c1251 fixed errors in custom fields view 2018-11-16 15:00:09 +01:00
daniel 0a097d185d fixed errors in custom fields view 2018-11-16 11:58:49 +01:00
samucarc dc6a293b52 Fixed error in agent table in GIS map 2018-11-14 11:53:12 +01:00
daniel 1c1df4b5f7 fixed errors css jqueryui 2018-11-07 17:09:42 +01:00
daniel 267f83cc4c add datatabes 2018-11-07 13:25:02 +01:00
daniel 7d54858b45 delete files dont use 2018-11-07 13:24:07 +01:00
alejandro-campos 74016c928f fixed bug: failing load of post process and unit fields in plugin component in module creation 2018-10-30 10:20:31 +01:00
vgilc 1973a5fe54 Merge branch '2326-unificar-vistas-ux-y-wux-en-un-mismo-portal' into 'develop'
WUX-UX integration

See merge request artica/pandorafms!1890
2018-10-26 14:42:23 +02:00
fbsanchez c06bd4207e estilos popup 2018-10-25 16:40:45 +02:00
fbsanchez 8619adbf4c estilos popup 2018-10-25 15:42:20 +02:00
fbsanchez 85051924b7 estilos popup 2018-10-25 14:01:12 +02:00
vgilc 82f6e3cb95 Merge branch '2786-Errores-en-mapas-de-red-dev' into 'develop'
Fixed group and set_center

See merge request artica/pandorafms!1880
2018-10-25 11:43:38 +02:00
vgilc 4f406d8702 Merge branch '2876-No-se-guardan-datos-Network-components' into 'develop'
Fixed bug in the data collection of network component when creating its corresponding module

See merge request artica/pandorafms!1865
2018-10-25 10:58:03 +02:00
danielmaya f10a661cd6 Fixed group and set_center 2018-10-23 12:36:20 +02:00