Commit Graph

134 Commits

Author SHA1 Message Date
samucarc 8f24c0cb18 Fixed conflict in CLI apply_policy
Former-commit-id: ab512d9c2b88cd7042d6ae065251cd116b2ea5af
2019-02-27 10:28:36 +01:00
alejandro-campos eb56fd566c implemented services treeview
Former-commit-id: d5d71442d0c6122ba91b160647559cdf03f55625
2019-02-22 13:07:47 +01:00
Tatiana Llorente 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
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 b3da2803a4 Changed the format of the .php files
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +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
daniel 46c23f9deb fixed minor errors in graphs: tree, labels, tocken meta 2018-06-14 12:17:16 +02:00
enriquecd 8d39ae54fa Filter by not init agents and modules in tree view - #1454 2018-03-28 17:07:57 +02:00
fermin831 e9932daf19 [Tree view] Substitute items by groups 2018-03-15 12:06:07 +01:00
fermin831 80ecb6f366 [Console Tree view] Added counter 2018-02-27 11:46:28 +01:00
daniel 7ea42dc5c5 add new filter tree view 2017-12-21 16:37:19 +01:00
Alejandro Gallardo Escobar 33ab429182 [Console] Now the group filter extract the searched groups and show their descendants 2017-12-05 09:43:37 +01:00
Alejandro Gallardo Escobar db056100e2 [Console > Tree view] Added a filter by group name and improved the filter by group id 2017-10-25 17:44:59 +02:00
Alejandro Gallardo Escobar d8340344b0 Added a dynamic height on the fixed bottom box 2015-09-11 11:58:12 +02:00
Alejandro Gallardo Escobar bf287dd98b Adapted the tree view to show the elements detail info using the fixed-bottom-box module 2015-09-07 11:54:15 +02:00
mdtrooper def7a59a97 Cleaned source code style. 2015-06-30 16:29:39 +02:00
mdtrooper 7574f6ed09 Clean the source code style. 2015-06-08 13:13:09 +02:00
mdtrooper 89cac169f4 Clean the source code style. 2015-06-08 11:05:19 +02:00
mdtrooper 819b1d5d77 Clean the source code style. 2015-06-08 09:32:01 +02:00
m-lopez-f 90d6ea15cf Merge branch 'develop' into feature/NewView 2015-04-27 10:12:45 +02:00
m-lopez-f b2ef7bc304 Changed visual of any views 2015-04-23 17:52:16 +02:00
Alejandro Gallardo Escobar 8a348c2411 Merge remote-tracking branch 'origin/develop' into feature/meta-agent-cache 2015-04-23 15:02:27 +02:00
m-lopez-f dc09a9a14e Change visual and add new images 2015-04-21 17:26:20 +02:00
Vanessa Gil f392f309d1 Added translation. 2015-04-20 15:48:06 +02:00
m-lopez-f ebe95af69e Add title when open visual data in treeview and status monitor, tiquet: #2077 2015-04-20 10:40:42 +02:00
Alejandro Gallardo Escobar 968c179c0c Merge branch 'develop' into feature/meta-agent-cache 2015-04-17 16:16:48 +02:00
Alejandro Gallardo Escobar 8826f0c80c Adapted the code to improve the performance of the tree view on the metaconsole with the 'tmetaconsole_agent' 2015-04-17 16:12:51 +02:00
m-lopez-f 7cb8e9dd16 Changed visual to tree view 2015-04-14 10:12:13 +02:00
m-lopez-f e90406abaf Hide data of agent/module when search again or new search. tiquet: #2052 2015-03-31 10:25:43 +02:00
m-lopez-f b58bd83523 Fixed problems when filter by 'Specify time range' and lost filter and not show data 2015-03-16 11:58:12 +01:00
Alejandro Gallardo Escobar 28c9f19320 Added the monitor filter to the strict ACL users 2015-03-12 15:04:12 +01:00
m-lopez-f d673737e2d Changed visual of metaconsole 2015-03-12 10:27:28 +01:00
Alejandro Gallardo Escobar ecb5a4097f A lot of changes into the agents and modules counters 2015-03-11 21:06:16 +01:00
m-lopez-f 6986fe0993 Changed visual of metaconsole 2015-03-11 11:31:46 +01:00
Alejandro Gallardo Escobar 756cf4cbf7 Added the posibility to filter by 1 group or tag. Useful when accessing the tree view from the group view 2015-03-09 19:29:45 +01:00
m-lopez-f 58722a5891 Changed visual of metaconsole 2015-03-06 12:28:05 +01:00
Alejandro Gallardo Escobar 7405dffbb4 Now the filter form is hidden by default 2015-02-04 12:47:47 +01:00
Alejandro Gallardo Escobar f6e31d4a17 Modified the view to restrict some controls when the strict ACL is enabled 2015-01-30 20:41:54 +01:00
Alejandro Gallardo Escobar d35e6bd360 Updated the old file to show the new tree views 2015-01-30 20:07:50 +01:00
m-lopez-f e879f6f755 Fixed problem in tree view with servername containt dot, tree not expand
Problem in loadSubTree in search field with id X
2015-01-28 11:56:38 +01:00
Alejandro Gallardo Escobar 265dda2a3f Merge branch 'develop' into feature/NewTreeView
Conflicts resolved:
	pandora_console/include/ajax/module.php
	pandora_console/include/functions_groups.php
2015-01-19 11:47:55 +01:00
KIKUCHI Koichiro a9f80dd01b Fixed the bug that tree view in meta console does not work properly. 2015-01-16 19:12:45 +09:00
KIKUCHI Koichiro 9a236c3df8 Small cleanup to prepare for the next changes. 2015-01-16 18:38:17 +09:00
Alejandro Gallardo Escobar 8d9ef4cc7c Removed the agent info table from the module detail table 2014-12-30 12:41:18 +01:00
Alejandro Gallardo Escobar 678755aa24 Removed the test code of the new tree view 2014-12-18 14:42:00 +01:00
Alejandro Gallardo Escobar 9b8f53691a Fixes 2014-12-17 19:45:09 +01:00
Alejandro Gallardo Escobar 530454ea72 Merge branch 'feature/NewTreeView' of https://github.com/pandorafms/pandorafms into feature/NewTreeView
Conflicts resolved:
	pandora_console/include/javascript/tree/TreeController.js
2014-12-17 19:13:23 +01:00
Alejandro Gallardo Escobar 304b36b13a Too lazy to explain 2014-12-17 19:11:07 +01:00
mdtrooper 9c60470d49 Working in the new code of treeview 2014-12-17 19:00:48 +01:00
Alejandro Gallardo Escobar 826dd6026a Improved the visual style 2014-12-17 13:47:40 +01:00