12617 Commits

Author SHA1 Message Date
cesar991
28eab16e61 Repair test D
(cherry picked from commit f3de10c345cb02049e3623eee4a188888ee8a650)
2016-09-29 13:30:58 +02:00
cesar991
97722310e2 Add new test, and extend create_plugin_component function
(cherry picked from commit 4345282d25e488d4a8dfd45f0625297dc084b28c)
2016-09-29 13:00:58 +02:00
artica
9db0020d8a Auto-updated build strings. 2016-09-29 00:01:37 +02:00
enriquecd
2fad731666 Merge branch 'pandora_6.0' of https://192.168.50.5:8081/artica/pandorafms into pandora_6.0 2016-09-28 18:17:07 +02:00
enriquecd
7928125092 repair visual bugs 2016-09-28 18:16:01 +02:00
m-lopez-f
8b1b4fc521 Fixed version mobile in metaconsole version. Internal ticket: 79 2016-09-28 17:08:44 +02:00
enriquecd
908bf8ee94 Changes on enterpise alert icons, limit screens and favicons
(cherry picked from commit b722e7062013ff1be1d220b1acaa1e23678aa939)
2016-09-28 15:03:42 +02:00
cesar991
d711f8493a Extend function for create new action 2016-09-28 14:54:38 +02:00
cesar991
b4079041a4 Add test alert and new functions in alert_functions.py
(cherry picked from commit 00519707ba42a44ed768ca724b09fa627fde76e3)
2016-09-28 12:55:53 +02:00
fbsanchez
ce90d552bc Fixed line endings 2016-09-28 12:36:40 +02:00
fbsanchez
91512d54d9 Updates on grep_log
1 data per mathed instance in multiline output
2016-09-28 12:24:35 +02:00
cesar991
794b640cf1 Add test Apply_policy_to_agents_with_spaces in Policies.py
(cherry picked from commit 113b77bf9fd60576d577d69db1b409d250f3d2b9)
2016-09-28 09:39:00 +02:00
Junichi Satoh
92f0780619 Added missing functions. 2016-09-28 10:59:36 +09:00
artica
2944c72f8b Auto-updated build strings. 2016-09-28 00:01:40 +02:00
daniel
79bc07eb62 fixed minor error in reports alerts tickets: 4063
(cherry picked from commit 626027a3025809cef2a58de8b112a53aa7925fa6)
2016-09-27 15:52:13 +02:00
Ramon Novoa
7c2e0ee6ed Fixed the testing framework. 2016-09-27 14:51:56 +02:00
daniel
95a79ad7ad ticket Integria: 4070 fixed visual console add custom graph #4070
(cherry picked from commit 33e7e40856701f1e26a30704342d81def6f01dbd)
2016-09-27 12:17:41 +02:00
cesar991
896d435f2e Add test C in Network_components and repair functions in network_components_functions
(cherry picked from commit 319d941c5e7b9831c242dd1e92cc63840d86dfe8)
2016-09-27 10:59:00 +02:00
artica
17abbdb150 Auto-updated build strings. 2016-09-27 00:01:36 +02:00
cesar991
90aeaf0f30 Add changes in pandora_6.0 of the commit 0b696e9c3b45a949b603bb1ee580fece17a9a6fe 2016-09-26 16:36:49 +02:00
cesar991
1783085663 Add new test in Network_components.py and repair a few errors in network_components_functions.py
(cherry picked from commit 5b1a5f48639ab25182fdcb05d7de5f1c7e67f503)
2016-09-26 15:47:10 +02:00
cesar991
b88c2a5aae Add a new tests file Network_components.py and repair errors in network_components_functions.py
(cherry picked from commit c3d07bfe12562e77d21e609aa8d781693f2c81b5)
2016-09-26 13:34:14 +02:00
cesar991
9aa182ddf3 Add create_plugin_component function in network_components_functions.py file
(cherry picked from commit 7e80de2b80db7516e1ae7b8f14640b45cf362515)
2016-09-26 12:33:08 +02:00
Hirofumi Kosaka
3e24107f81 Consider multi-byte chars in plugin_macros (in network components). 2016-09-26 18:47:41 +09:00
enriquecd
611413e806 Merge branch 'pandora_6.0' of https://brutus.artica.lan:8081/artica/pandorafms into pandora_6.0 2016-09-26 11:42:10 +02:00
enriquecd
d4ba681833 header logo and login logo limited for pandoraopen, module group aspect and update manager modal window. 64,63,59,48,61
modificacion de estilos de ventana modal y editor de usuarios

(cherry picked from commit 6f33c0eaf877030ef6ecea00b73cdc74c3609969)
2016-09-26 11:37:41 +02:00
cesar991
955860be29 Add network_component_functions.py file
(cherry picked from commit 5d1c8d27fd8a86e9acd369095133fd68ff1aa6ed)
2016-09-26 11:29:26 +02:00
artica
3bf3aecf9c Auto-updated build strings. 2016-09-26 00:01:32 +02:00
Junichi Satoh
6b672deb68 Added default value (unknown) to $OS_VERSION to avoid undefined value when
OS type is not detected. And added $OS_VERSION support for FreeBSD.

(Cherry picked from commit 2b5368e8b5822fb128341cab17eaac6a902961ca)
2016-09-25 13:08:26 +09:00
Junichi Satoh
e1672afb53 Fixed menu is not selectable. (Removed unnecessary return.)
(Cherry picked from commit cf4255bf21c30726d6868fca1e07a35a6cd5aadd)
2016-09-25 12:58:05 +09:00
artica
a07d133d0f Auto-updated build strings. 2016-09-25 00:01:28 +02:00
artica
dc1bf050ab Auto-updated build strings. 2016-09-24 00:01:33 +02:00
m-lopez-f
28440e1ac3 Add percert of critical agents in group view. Ticket: #3344
(cherry picked from commit 50e2c14ce87ea31861a5f6418d811d142ae78019)
2016-09-23 13:47:11 +02:00
m-lopez-f
4be427bad9 can't use mobile version when you install metaconsole version, add redirect. Ticket: #4067 2016-09-23 11:57:07 +02:00
m-lopez-f
c916d49bdf Merge branch 'pandora_6.0' of https://192.168.50.5:8081/artica/pandorafms into pandora_6.0 2016-09-23 10:36:32 +02:00
m-lopez-f
5f11a0670f Fixed problems with ACL. Ticket: #4057
(cherry picked from commit fb56c16e19e3f289b55fbfef36d22162465e5c41)
2016-09-23 10:14:30 +02:00
artica
192362705b Auto-updated build strings. 2016-09-23 00:01:32 +02:00
m-lopez-f
9b9a25cea3 Fixed styles of simple value in visual console 2016-09-22 15:23:12 +02:00
m-lopez-f
6fd6c90424 Change visual of put permissions of AD. Ticket: #4057 2016-09-22 15:21:39 +02:00
enriquecd
d0586a8e24 modification of modal window styles and editor users
(cherry picked from commit 6f33c0eaf877030ef6ecea00b73cdc74c3609969)
2016-09-22 11:29:23 +02:00
daniel
5e2706efd1 Ticket integria:4063 fixed report alert for module, group, agent
(cherry picked from commit d2617df147b257dddce1e20a8ccb3cbcc03ec4c6)
2016-09-22 10:57:34 +02:00
m-lopez-f
ebc78153cd Delete debug log line 2016-09-22 09:10:23 +02:00
m-lopez-f
5c1fd7f962 add lost lines of fixed old problem. Ticket: #3912 2016-09-22 09:09:49 +02:00
artica
68f01e9843 Auto-updated build strings. 2016-09-22 00:02:20 +02:00
artica
39804adda3 Auto-updated build strings. 2016-09-21 00:01:41 +02:00
enriquecd
95d73ceb88 visually enhance dialog box events, assignment alerts, alert list #58#52#57 2016-09-20 17:08:02 +02:00
cesar991
1ae453d8bc Add copy modules in bulk function
(cherry picked from commit 03a2e160155b362a3f4c7d8ca1b788c847e6ada9)
2016-09-20 15:44:04 +02:00
cesar991
58de8a8fbf Add new test in Bulk_operations file and repair errors
(cherry picked from commit bb686bcbd797b63a001f4080e870c002b59ca898)

Conflicts:
	tests/console/Bulk_operations.py
2016-09-20 13:41:45 +02:00
enriquecd
b4f8926e75 Change menu header title truncate
(cherry picked from commit 775644c247e8a825763fc0f2ce2fe17caf13b77a)
2016-09-20 11:28:38 +02:00
artica
e457deaaf1 Auto-updated build strings. 2016-09-20 00:01:39 +02:00