Commit Graph

12799 Commits

Author SHA1 Message Date
daniel e48e1ddd7e ticket: 4069 add actions for defect in templates html #4069 2016-09-29 14:30:07 +02:00
cesar991 f3de10c345 Repair test D 2016-09-29 13:30:19 +02:00
cesar991 4345282d25 Add new test, and extend create_plugin_component function 2016-09-29 12:59:11 +02:00
artica 44eaacf1c7 Auto-updated build strings. 2016-09-29 00:01:21 +02:00
enriquecd 4f8cf57ee1 Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop 2016-09-28 18:21:28 +02:00
enriquecd e5c82954f3 repair visual bugs
(cherry picked from commit 7928125092)
2016-09-28 18:20:42 +02:00
m-lopez-f aa553c14b3 Fixed version mobile in metaconsole version. Internal ticket: 79 2016-09-28 16:56:05 +02:00
m-lopez-f 657cd44a30 Revert "Fixed version mobile in metaconsole version"
This reverts commit a5e14a26bb.
2016-09-28 16:06:51 +02:00
m-lopez-f a5e14a26bb Fixed version mobile in metaconsole version 2016-09-28 16:04:13 +02:00
cesar991 e607a718cb Extend function for create new action
(cherry picked from commit d711f8493a)
2016-09-28 14:56:24 +02:00
enriquecd 0d8d2d81b4 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2016-09-28 13:43:05 +02:00
enriquecd b722e70620 Changes on enterpise alert icons, limit screens and favicons 2016-09-28 13:26:58 +02:00
cesar991 29bf3dc1bd Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2016-09-28 12:54:43 +02:00
cesar991 00519707ba Add test alert and new functions in alert_functions.py 2016-09-28 12:53:30 +02:00
fbsanchez d98b108443 Fixed line endings
(cherry picked from commit ce90d552bc)
2016-09-28 12:37:30 +02:00
fbsanchez 6daa28e69a Updates on grep_log
1 data per mathed instance in multiline output

(cherry picked from commit 91512d54d9)
2016-09-28 12:31:20 +02:00
Arturo Gonzalez 4baea754bb New networkmaps in progress... (Added filter to links) 2016-09-28 10:45:46 +02:00
Arturo Gonzalez c012b2fd95 New networkm aps in progress... (Working in AM links) 2016-09-28 10:44:14 +02:00
cesar991 113b77bf9f Add test Apply_policy_to_agents_with_spaces in Policies.py 2016-09-28 09:37:48 +02:00
Arturo Gonzalez d2a4e689b5 New networkmaps in progress... (Working in the l2 and l3 fusion system (NO DBZ FUSION)) 2016-09-28 09:01:15 +02:00
artica 4416785e75 Auto-updated build strings. 2016-09-28 00:01:25 +02:00
daniel 626027a302 fixed minor error in reports alerts tickets: 4063 2016-09-27 15:50:42 +02:00
Ramon Novoa 7146779488 Commented out the ACL_tag test. 2016-09-27 12:42:55 +02:00
daniel 33e7e40856 ticket Integria: 4070 fixed visual console add custom graph #4070 2016-09-27 12:16:14 +02:00
Ramon Novoa 112d57df5d Merge branch 'pullrequest#70' into develop 2016-09-27 11:50:10 +02:00
Arturo Gonzalez 30d30df548 New networmaps in progress... (Fixed open map with interfaces) 2016-09-27 11:43:57 +02:00
cesar991 7850c6aa16 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2016-09-27 10:58:17 +02:00
cesar991 319d941c5e Add test C in Network_components and repair functions in network_components_functions 2016-09-27 10:56:38 +02:00
Ramon Novoa 0012420086 Merge branch 'pullrequest#71' into develop 2016-09-27 09:34:17 +02:00
artica 9c38192340 Auto-updated build strings. 2016-09-27 00:01:21 +02:00
luzik 7d33af357d added net-snmp-utils to Dockerfile
pandora-console required net-snmp-utils to run SNMP wizard from web console
2016-09-26 20:46:23 +02:00
luzik 902036c0ec Docker bug workaround 'Text file busy'
This is workaround  of this docker issue https://github.com/docker/docker/issues/9547
2016-09-26 19:52:53 +02:00
cesar991 0b696e9c3b Add new test copy_modules_in_bulk and repair errors in bulk_operations.py 2016-09-26 16:30:52 +02:00
Arturo Gonzalez 446063dd51 New networkmaps in progress... (hells commit with magic to fix the interface links) 2016-09-26 16:14:12 +02:00
cesar991 5b1a5f4863 Add new test in Network_components.py and repair a few errors in network_components_functions.py 2016-09-26 15:45:42 +02:00
cesar991 c3d07bfe12 Add a new tests file Network_components.py and repair errors in network_components_functions.py 2016-09-26 13:32:09 +02:00
cesar991 306d341149 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2016-09-26 12:32:07 +02:00
cesar991 7e80de2b80 Add create_plugin_component function in network_components_functions.py file 2016-09-26 12:31:08 +02:00
Hirofumi Kosaka d4675bea8d Consider multi-byte chars in plugin_macros (in network components). 2016-09-26 18:49:29 +09:00
enriquecd 22a4dbe67b 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)
(cherry picked from commit d4ba681833)
2016-09-26 11:46:41 +02:00
cesar991 d5e65c427d Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2016-09-26 11:27:59 +02:00
cesar991 5d1c8d27fd Add network_component_functions.py file 2016-09-26 11:27:19 +02:00
artica 4820706e93 Auto-updated build strings. 2016-09-26 00:01:14 +02:00
Junichi Satoh 2b5368e8b5 Added default value (unknown) to $OS_VERSION to avoid undefined value when
OS type is not detected. And added $OS_VERSION support for FreeBSD.
2016-09-25 13:03:02 +09:00
Junichi Satoh cf4255bf21 Fixed menu is not selectable. (Removed unnecessary return.) 2016-09-25 12:53:31 +09:00
artica e08a7f2505 Auto-updated build strings. 2016-09-25 00:01:11 +02:00
artica 0fc32c31e3 Auto-updated build strings. 2016-09-24 00:01:16 +02:00
m-lopez-f 50e2c14ce8 Add percert of critical agents in group view. Ticket: #3344 2016-09-23 13:46:44 +02:00
m-lopez-f 66957b5580 can't use mobile version when you install metaconsole version, add redirect. Ticket: #4067
(cherry picked from commit 4be427bad9)
2016-09-23 11:57:34 +02:00
m-lopez-f fb56c16e19 Fixed problems with ACL. Ticket: #4057 2016-09-23 10:13:54 +02:00