9881 Commits

Author SHA1 Message Date
m-lopez-f
b63f1cfe81 Add new image for tree view, not view in internet explorer 2015-04-06 13:49:28 +02:00
m-lopez-f
ff7fd3d8a7 Fixed menu and change visual 2015-04-06 12:44:35 +02:00
m-lopez-f
da24887922 Merge branch 'develop' into feature/NewView 2015-04-06 12:33:26 +02:00
m-lopez-f
119960177b Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-06 12:18:28 +02:00
m-lopez-f
0ab523ca9a Add warning when 'Event Storm protection' is activated, tiquet: #2065 2015-04-06 12:18:14 +02:00
Ramón Novoa
e8e59f3e3e Merge pull request #11 from hkosaka/pandora_agent_proxy_mode_with_SSL
Pandora agent proxy mode with ssl
2015-04-06 11:14:38 +02:00
m-lopez-f
790c81a250 Add order in parent select in static graph in visual console, Tiquet: #2067 2015-04-06 10:25:03 +02:00
artica
3cd52be7e9 Auto-updated build strings. 2015-04-06 00:01:07 +02:00
m-lopez-f
a55fb5ec72 Change visual of console 2015-04-01 14:13:41 +02:00
m-lopez-f
f8c481a3ee Change views and styles in Console 2015-04-01 13:47:45 +02:00
m-lopez-f
0213cd7405 Change views and styles in Console 2015-04-01 13:24:53 +02:00
m-lopez-f
acfd2146dc Change views and styles in Console 2015-04-01 12:09:23 +02:00
Vanessa Gil
fae014e570 Update translations. 2015-04-01 11:09:04 +02:00
m-lopez-f
0e29cc520e Change visual of node 2015-03-31 17:26:22 +02:00
m-lopez-f
6cec43c5fa Merge branch 'develop' into feature/NewView 2015-03-31 17:23:05 +02:00
m-lopez-f
d7f6868217 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-03-31 17:03:36 +02:00
Alejandro Gallardo Escobar
72af6134a1 Improved a jquery selector 2015-03-31 18:10:13 +02:00
Alejandro Gallardo Escobar
722c95c470 Replaced the old tooltip for the jquery widget version in the networkmaps section 2015-03-31 17:30:53 +02:00
m-lopez-f
7e02141e3f Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-03-31 14:46:58 +02:00
m-lopez-f
a756ef1ab5 Fixed filter by name module in tree view, Node and Meta. tiquet: 2056 2015-03-31 14:46:43 +02:00
Alejandro Gallardo Escobar
c0bc9ad136 Added a padding to the graph to prevent the text cut 2015-03-31 14:11:17 +02:00
Alejandro Gallardo Escobar
521845ee91 ACL improvements 2015-03-31 13:30:16 +02:00
Alejandro Gallardo Escobar
9bb62f1f43 Added the new way to store the maps in groups and ACL improvements 2015-03-31 12:27:12 +02:00
Alejandro Gallardo Escobar
973f0c3e2e Error fixes and improvements 2015-03-31 12:27:12 +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
92b1be06ab Change visual of Group View 2015-03-31 09:52:27 +02:00
m-lopez-f
16679256e9 Change visual of any views 2015-03-31 09:28:06 +02:00
m-lopez-f
62c940986b Change menu and actions in this menu. 2015-03-31 09:18:46 +02:00
m-lopez-f
a9bf3490fb Merge branch 'develop' into feature/NewView 2015-03-31 09:13:51 +02:00
m-lopez-f
f23e6ceacf Change label text in save filter events in metaconsole, tiquet: #2053 2015-03-31 08:36:54 +02:00
Alejandro Gallardo Escobar
91b7bf19a5 Added functions to help with the data assign to the variables 2015-03-30 17:28:12 +02:00
mdtrooper
62c7ac463d Working in the refactoring the code of reports (agent_configuration). 2015-03-30 17:07:57 +02:00
Alejandro Gallardo Escobar
9920fa9a3f Fixed a missing tooltip 2015-03-30 12:03:34 +02:00
mdtrooper
aabec6784e Rever some changes from the previous merge. 2015-03-30 11:33:26 +02:00
hkosaka
ed53b3c67b Specify -C option to Launch tentacle_server when using SSL proxy mode. 2015-03-30 18:29:44 +09:00
mdtrooper
f8e544b89e Merge branch 'develop' into feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES
Conflicts:
	pandora_console/include/functions_reporting.php
2015-03-30 11:09:13 +02:00
hkosaka
edfaa25a9f Add -C option to tentalce_server that enables SSL (to proxied server) without a client certificate.
This option corresponds to tentacle_client's -c option.
2015-03-30 17:56:33 +09:00
mdtrooper
cc8305429e Manual (by hand) cherry pick from the commit 63d322244dd9ca51ee35c1f7cd38b4c3755ef9e0 2015-03-30 10:52:58 +02:00
m-lopez-f
ffd099c782 Changed for fixed visual of metaconsole 2015-03-30 10:17:35 +02:00
artica
1d21b164b8 Auto-updated build strings. 2015-03-29 00:01:09 +01:00
Alejandro Gallardo Escobar
fd41fba3d8 Changed the behaviour of the network map tooltip info for the strict users 2015-03-27 14:32:31 +01:00
mdtrooper
cf09a85cd2 Workin in the refactoring the code of reports, move some functions from functions_repoting_html.php to functions_reporting.php 2015-03-27 13:03:15 +01:00
mdtrooper
54916a8002 Working in the refactoring the code of reports (MTTR, MTBF, TTO). 2015-03-27 10:24:44 +01:00
artica
c29c47dc09 Auto-updated build strings. 2015-03-27 00:01:12 +01:00
Alejandro Gallardo Escobar
3d84b80c52 Fixed an error on the function 'tags_get_user_module_and_tags' caused by a string=integer comparision 2015-03-26 22:28:18 +01:00
Alejandro Gallardo Escobar
12013f8263 Merge branch 'feature/ticket#2028-network-map' into develop 2015-03-26 21:22:51 +01:00
Alejandro Gallardo Escobar
b99e777300 Fixed an error on the function"tags_get_all_user_agents" 2015-03-26 21:17:53 +01:00
mdtrooper
56f4f3dc52 Merge branch 'develop' into feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES 2015-03-26 19:47:52 +01:00
mdtrooper
99247f7286 Manual (by hand) cherry pick of commit c7fa8710ec64fb90f77736bfc25d432bb7777dc2 2015-03-26 19:39:11 +01:00
Alejandro Gallardo Escobar
63d322244d Added a new parameter to the modules retrieving by tag function 2015-03-26 19:34:56 +01:00