12092 Commits

Author SHA1 Message Date
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
enriquecd
7b75b41f5b Merge branch 'pandora_6.0' of https://brutus.artica.lan:8081/artica/pandorafms into pandora_6.0 2016-09-19 17:15:32 +02:00
enriquecd
b1353845c8 change module template popup - ticket 68 2016-09-19 16:56:15 +02:00
daniel
dcb67e2207 Ticket integria:3621 fixed image in mail #75
(cherry picked from commit 653da41402c00359ed204296fe18bfd0c7b78013)
2016-09-19 16:45:15 +02:00
enriquecd
e66a06aac6 GUI improvement, add enterprise edition popup - ticket gitlab 49/68
(cherry picked from commit a051243b6458510dcae775055df8314894aa9695)
2016-09-19 16:31:12 +02:00
daniel
4846af1049 fixed minor errors query view agents
(cherry picked from commit 89e31494799ef6e2a98d4dc033df6a3438060702)
2016-09-19 12:07:18 +02:00
daniel
8a1deb4b87 add graph agent new feature ticket integria: 3722
(cherry picked from commit dcb18bcbd2c2584400243f69515f6b17996dd691)
2016-09-19 11:51:36 +02:00
m-lopez-f
8b5aa318a3 Delete log lines
(cherry picked from commit 2437b0b81f2a425cd0535ebcc19a992a4efbc754)
2016-09-19 10:47:08 +02:00
m-lopez-f
3a63aa9589 Fixed error in pandora.js 2016-09-19 10:36:09 +02:00
artica
5fc245041d Auto-updated build strings. 2016-09-19 00:01:33 +02:00
artica
7e0f1a8966 Auto-updated build strings. 2016-09-18 00:01:34 +02:00
artica
9bf96ebc5f Auto-updated build strings. 2016-09-17 00:01:39 +02:00
cesar991
a6068d43bf Delete test_G in Bulk_operations.py 2016-09-16 12:56:12 +02:00
Ramon Novoa
f16fbf5a6e Temporarily disabled the saucelab integration (the tunnel keeps failing).
(cherry picked from commit 6460d22c572b62d4b8363d1f8e9226f18b3307a7)
2016-09-16 11:22:32 +02:00
m-lopez-f
6f89eba519 Change transparency of colors in graphs. Ticket: #4046 2016-09-16 11:19:52 +02:00
cesar991
afc267dc59 Repair error in test_G 2016-09-16 10:48:25 +02:00
cesar991
4c7158b98d Add test_G_edit_module_threshold_in_bulk in Bulk_operations.py
(cherry picked from commit 7e33abcbd44eb495de906c7d3474a8b24a2d8b81)
2016-09-16 10:44:05 +02:00
cesar991
aa3d57f438 Add asserts in test F Bulk_operations.py file
(cherry picked from commit b6f863353c050d4be50c91b4d02f5a5938661746)
2016-09-16 10:40:17 +02:00
Daniel Maya
222f5ff63d Changes in the types of format accepted.Ticket #4032.
(cherry picked from commit 24d466e185ceee204871ae1e9e7a650c34043c06)
2016-09-16 09:27:19 +02:00
artica
7d47304fdc Auto-updated build strings. 2016-09-16 00:01:36 +02:00
cesar991
11b3667f24 Merge branch 'pandora_6.0' of https://brutus.artica.lan:8081/artica/pandorafms into pandora_6.0 2016-09-15 16:19:03 +02:00
cesar991
7d1de5c922 Add changes in Bulk_operations.py and extend search_module function 2016-09-15 16:18:25 +02:00
Daniel Maya
458e01951a FFixed editing plugins. Ticket #4032.
(cherry picked from commit a3cd8a7c869f2274eba2523409c53ab7601f45d4)
2016-09-15 15:50:43 +02:00
m-lopez-f
c12f0dba1c Fixed javascript problems when configure ACL permmisions
(cherry picked from commit 67e366cc9d8bfefa14e34e903c3cef6941fcda24)
2016-09-15 13:35:34 +02:00
artica
b41c9aace2 Auto-updated build strings. 2016-09-15 00:01:37 +02:00
cesar991
b144225e99 Add test_F_edit_module_umbral_in_bulk in Bulk_operations.py file 2016-09-14 15:14:32 +02:00