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

2825 Commits

Author SHA1 Message Date
enriquecd 7bf1b7c0f2 fix visual errors 
(cherry picked from commit 78f5d79638)
 2016-09-29 15:09:10 +02:00
daniel 47451ee9fb ticket: 4069 add actions for defect in templates html #4069 
(cherry picked from commit e48e1ddd7e)
 2016-09-29 14:31:33 +02:00
enriquecd 7928125092 repair visual bugs 2016-09-28 18:16:01 +02:00
enriquecd 908bf8ee94 Changes on enterpise alert icons, limit screens and favicons 
(cherry picked from commit b722e70620)
 2016-09-28 15:03:42 +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
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
m-lopez-f 5f11a0670f Fixed problems with ACL. Ticket: #4057 
(cherry picked from commit fb56c16e19)
 2016-09-23 10:14:30 +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 5c1fd7f962 add lost lines of fixed old problem. Ticket: #3912 2016-09-22 09:09:49 +02:00
enriquecd 95d73ceb88 visually enhance dialog box events, assignment alerts, alert list #58#52#57 2016-09-20 17:08:02 +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 Maya 458e01951a FFixed editing plugins. Ticket #4032. 
(cherry picked from commit a3cd8a7c86)
 2016-09-15 15:50:43 +02:00
m-lopez-f bdba5c4c05 Add label with macros in reports. Ticket: #37 
(cherry picked from commit a804040d79)
 2016-09-12 16:29:27 +02:00
Junichi Satoh 89d32c884f Fixed missing gettext. 
(cherry picked from commit 51519053b8)
 2016-09-12 14:29:28 +09:00
m-lopez-f 82b21020f2 Fixed problems with acl's. Ticket: #3912 2016-09-08 14:40:01 +02:00
m-lopez-f f3b9703242 Fixed problems with acl's. Ticket: #3912 2016-09-08 12:59:41 +02:00
m-lopez-f 3d24f0ecba Fixed problems with ACL's permissions. Ticket: #3912 2016-09-08 11:26:59 +02:00
Daniel Maya 19d6b11759 Fixed bug in server list. Ticket #4010. 2016-09-06 09:25:40 +02:00
Daniel Maya f74db76d57 Added desc order in manage agents. Ticket #4004. 
(cherry picked from commit 1958f2b5e3)

Resolved Conflicts:
	pandora_console/godmode/agentes/modificar_agente.php
 2016-09-05 15:41:19 +02:00
m-lopez-f 15cf2b6f0b Fixed problems with password in WMI explorer when use specials characters. GitHub ticket: #60 2016-09-05 08:54:01 +02:00
Daniel Maya b277a0d542 Added search by multiple ips agents. Ticket #3949. 
(cherry picked from commit b8306bbf00)
 2016-08-31 15:39:46 +02:00
m-lopez-f 5ee29865ab When click in management permmision autoclicked in inferior options of same part. Ticket: #3912 
(cherry picked from commit a0753238f7)
 2016-08-31 15:24:46 +02:00
fbsanchez 77ed3ae3fc Fixed double include (functions_modules.php) 2016-08-30 13:56:51 +02:00
m-lopez-f fc4874fbd0 Fixed problems with menu. Internal Ticket: #3912 2016-08-29 13:25:00 +02:00
Daniel Maya cb8b91ad32 Fixed bug in recontask form. Ticket #3960. 
(cherry picked from commit 108340dbee)
 2016-08-29 12:59:11 +02:00
Daniel Maya db09b83e57 Fixed orders groups. Ticket #3926. 
(cherry picked from commit 0e53477fa7)
 2016-08-29 12:07:52 +02:00
m-lopez-f 1f762f89e5 Fixed problems with ACL permmisions. Internal Tiquet: #3912 2016-08-29 09:48:08 +02:00
m-lopez-f 8dc302d313 Add if use ssl cert and path of this cert. #5 
(cherry picked from commit be3a520488)
 2016-08-26 12:42:20 +02:00
daniel fe5ceb3272 ticket integria: 3996 fixed minor error in maxlenght #30 
(cherry picked from commit 4375feab72)
 2016-08-25 11:50:25 +02:00
Daniel Maya bed4f8e3d8 Fixed token fontpath in windows. Ticket #3316. 
(cherry picked from commit 2dffe9b1b8)
 2016-08-23 12:01:15 +02:00
Daniel Maya b52223a7ea Added new check to equalize maximum thresholds. Ticket #3732. 
(cherry picked from commit bb26f4b82d)

Conflicts:
	pandora_console/include/functions_graph.php
 2016-08-23 09:01:41 +02:00
daniel b51cb79178 ticket integria: 3897 add number agent disabled/enabled in license #27 
(cherry picked from commit d1794b8385)
 2016-08-18 11:18:40 +02:00
m-lopez-f fa64072cfc Fixed problems with form in recon task. GitHub #59 
(cherry picked from commit 0367f88f56)
 2016-08-17 15:12:20 +02:00
m-lopez-f 6c27a6e16a Delete html tag. Tiquet: #3246 
(cherry picked from commit 8e7f2cdd90)
 2016-08-17 12:03:51 +02:00
m-lopez-f bc4011694a Fixed problems with search form in Policies form. Tiquet: #3246 
(cherry picked from commit f3478168a7)
 2016-08-17 11:59:45 +02:00
daniel 3bf5801d13 ticket integria: 3980 fixed error link recon_task IPAM #25 
(cherry picked from commit d855f72f59)
 2016-08-17 11:54:08 +02:00
m-lopez-f e0c3e04e03 Fixed problem with charge agents when select 'Agents firts in module bulk actions'. Tiquet: #3568 
(cherry picked from commit 77758f993a)
 2016-08-17 10:31:09 +02:00
m-lopez-f ec08ccd7c1 Fixed problems with html-labels and html editor in visual console. Tiquets: #3918 and #3985 2016-08-16 14:04:01 +02:00
m-lopez-f 25fedd8e84 Revert "Fixed problems qith html editor in textareas in visual console" 
Cause: https://www.tinymce.com/docs/plugins/bbcode/ and problems with labels in visual console.
This reverts commit 06e37132a8.
 2016-08-16 13:54:13 +02:00
Daniel Maya b49ccc5982 Added audit log. Tciket #3714. 
(cherry picked from commit 6a5538346a)

Conflicts:
	pandora_console/godmode/setup/setup_general.php
	pandora_console/include/functions_config.php
 2016-08-12 08:52:21 +02:00
fbsanchez 9865bf7aff Ticket 3462: Provided snmp help/std help based on referer 2016-07-29 15:44:07 +02:00
Arturo Gonzalez 910857d57f Added new checkbox to hide agents that its first data time is less than report final time. Ticket 2 Gitlab 
(cherry picked from commit 2f462370e8)
 2016-07-21 14:59:02 +02:00
m-lopez-f 06e37132a8 Fixed problems qith html editor in textareas in visual console 2016-07-21 14:48:56 +02:00
Daniel Maya ba9c3c5d84 Fixed CSV export in system audit log. Ticket #3902. 
(cherry picked from commit 4262956711)
 2016-07-19 16:14:22 +02:00
Daniel Maya a770d51c73 Added pagination in custom graphics. Ticket #3886. 
(cherry picked from commit 00b17f5eda)
 2016-06-30 08:50:04 +02:00
Daniel Maya 6bb5b93a7f show unknown and not init modules. Ticket #3844. 
(cherry picked from commit e4cdef363e)
 2016-06-29 10:44:00 +02:00
m-lopez-f a8b4f7f535 Fixed help of action alerts. Tiquet: #3889 
(cherry picked from commit 04c1304a5d)
 2016-06-27 13:10:07 +02:00