tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
11,954 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

11954 Commits

Author SHA1 Message Date
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 626027a302)
 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 33e7e40856)
 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 319d941c5e)
 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 0b696e9c3b 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 5b1a5f4863)
 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 c3d07bfe12)
 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 7e80de2b80)
 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 6f33c0eaf8)
 2016-09-26 11:37:41 +02:00
cesar991 955860be29 Add network_component_functions.py file 
(cherry picked from commit 5d1c8d27fd)
 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 2b5368e8b5)
 2016-09-25 13:08:26 +09:00
Junichi Satoh e1672afb53 Fixed menu is not selectable. (Removed unnecessary return.) 
(Cherry picked from commit cf4255bf21)
 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 50e2c14ce8)
 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 fb56c16e19)
 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 6f33c0eaf8)
 2016-09-22 11:29:23 +02:00
daniel 5e2706efd1 Ticket integria:4063 fixed report alert for module, group, agent 
(cherry picked from commit d2617df147)
 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 03a2e16015)
 2016-09-20 15:44:04 +02:00
cesar991 58de8a8fbf Add new test in Bulk_operations file and repair errors 
(cherry picked from commit bb686bcbd7)

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 775644c247)
 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 653da41402)
 2016-09-19 16:45:15 +02:00
enriquecd e66a06aac6 GUI improvement, add enterprise edition popup - ticket gitlab 49/68 
(cherry picked from commit a051243b64)
 2016-09-19 16:31:12 +02:00
daniel 4846af1049 fixed minor errors query view agents 
(cherry picked from commit 89e3149479)
 2016-09-19 12:07:18 +02:00
daniel 8a1deb4b87 add graph agent new feature ticket integria: 3722 
(cherry picked from commit dcb18bcbd2)
 2016-09-19 11:51:36 +02:00
m-lopez-f 8b5aa318a3 Delete log lines 
(cherry picked from commit 2437b0b81f)
 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 6460d22c57)
 2016-09-16 11:22:32 +02:00