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

9203 Commits

Author SHA1 Message Date
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
artica 17abbdb150 Auto-updated build strings. 2016-09-27 00:01:36 +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
artica 3bf3aecf9c Auto-updated build strings. 2016-09-26 00:01:32 +02: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
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
m-lopez-f 6f89eba519 Change transparency of colors in graphs. Ticket: #4046 2016-09-16 11:19:52 +02:00
Daniel Maya 222f5ff63d Changes in the types of format accepted.Ticket #4032. 
(cherry picked from commit 24d466e185)
 2016-09-16 09:27:19 +02:00
artica 7d47304fdc Auto-updated build strings. 2016-09-16 00:01:36 +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 c12f0dba1c Fixed javascript problems when configure ACL permmisions 
(cherry picked from commit 67e366cc9d)
 2016-09-15 13:35:34 +02:00
artica b41c9aace2 Auto-updated build strings. 2016-09-15 00:01:37 +02:00
m-lopez-f 8c08a8c997 Fixed problems with labels in custom graphs when use this type en reports 2016-09-14 12:27:18 +02:00
m-lopez-f 71a3014ec2 Fixed problems with label and title in simple graph of monitor status 2016-09-14 10:31:35 +02:00
Arturo Gonzalez 0f01088bb5 Added autorefresh control when event dialog is open 
(cherry picked from commit 7c2301fde6)
 2016-09-14 09:31:05 +02:00
artica 0ea1ee1eb2 Auto-updated build strings. 2016-09-14 00:01:35 +02:00
m-lopez-f bb5b685508 Fixed problems with label in graphics on monitors view 2016-09-13 15:20:51 +02:00
artica 6981aa7ba4 Auto-updated build strings. 2016-09-13 00:01:36 +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
Arturo Gonzalez eaa98269b2 Fixed monitor details search by module name and module group. Ticket #4025 2016-09-12 12:08:25 +02:00
Arturo Gonzalez 9ea430cfc1 Revert "Fixed monitor details search by module name and module group. Ticket #4025" 
This reverts commit ed4693a6fe.
 2016-09-12 12:06:38 +02:00
Arturo Gonzalez 2de8122edc Merge branch 'pandora_6.0' of https://brutus.artica.lan:8081/artica/pandorafms into pandora_6.0 2016-09-12 11:58:29 +02:00
Arturo Gonzalez ed4693a6fe Fixed monitor details search by module name and module group. Ticket #4025 
(cherry picked from commit dbb5aeee4c)
 2016-09-12 11:58:20 +02:00
Junichi Satoh 89d32c884f Fixed missing gettext. 
(cherry picked from commit 51519053b8)
 2016-09-12 14:29:28 +09:00
Junichi Satoh e97971485a Updated Japanese translations. 2016-09-12 14:11:50 +09:00
artica b82fbe2c53 Auto-updated build strings. 2016-09-12 00:01:31 +02:00
artica 44e2fec1be Auto-updated build strings. 2016-09-10 00:01:30 +02:00
m-lopez-f 4c5d3b2736 Fixed problems with style and format text in visual consoles. Issue #40 2016-09-09 09:46:37 +02:00
Daniel Maya fc213ffde3 Ticket #3316 
(cherry picked from commit 95030c5da5)
 2016-09-09 09:39:20 +02:00
Daniel Maya b925226ab2 Fixed bug.ticket #3316 
(cherry picked from commit 39c2cb3bad)
 2016-09-09 09:39:20 +02:00
Daniel Maya 8ada33731a Added new feature. Added font and fotn size in custom graph. Ticket #3316. 
(cherry picked from commit 203689a5c1)
 2016-09-09 09:39:20 +02:00
m-lopez-f b36b1b2113 Merge branch 'pandora_6.0' of https://192.168.50.5:8081/artica/pandorafms into pandora_6.0 2016-09-09 09:37:26 +02:00
m-lopez-f 42c3e83578 Fixed problems with style and format text in visual consoles. Issue #40 
(cherry picked from commit c7df9a7d68)
 2016-09-09 09:37:17 +02:00
artica a17737206d Auto-updated build strings. 2016-09-09 00:01:31 +02: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
m-lopez-f 18d3f1e7a0 Fixed problems with auto-refresh 2016-09-08 09:50:13 +02:00
artica 070659e948 Auto-updated build strings. 2016-09-08 00:01:30 +02:00
m-lopez-f 39348e2e70 Fixed problems with threshold. Ticket: #3777 
(cherry picked from commit c0d2cf6f8e)
 2016-09-07 13:01:20 +02:00
artica a6ad55e1d0 Auto-updated build strings. 2016-09-07 00:01:31 +02:00
m-lopez-f 175fb428ce Only show error of licences if user is admin. Ticket: #3999 2016-09-06 16:02:28 +02:00
m-lopez-f 9b19a24604 Fixed problems with styles in visual console. Ticket: #3985 2016-09-06 12:49:51 +02:00
Daniel Maya 19d6b11759 Fixed bug in server list. Ticket #4010. 2016-09-06 09:25:40 +02:00
artica 626e3ec01b Auto-updated build strings. 2016-09-06 00:01:33 +02:00
axl89 3c9fba9bac Updated English translations 2016-09-05 17:02:07 +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 2bcad66324 Fixed styles in visual console label editor. Ticket: #3985 2016-09-05 14:16:31 +02:00
Daniel Maya 5f830a48ad Added search by multiple ips agents. Ticket #3949. 
(cherry picked from commit d39123eb0a)
 2016-09-05 13:53:55 +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
artica 455d7bad52 Auto-updated build strings. 2016-09-05 00:01:28 +02:00
artica 3c354bfba9 Auto-updated build strings. 2016-09-04 00:01:29 +02:00
artica 972afa7361 Auto-updated build strings. 2016-09-03 00:01:32 +02:00
Hirofumi Kosaka 657c11da1f Added new API 'delete_group'. 2016-09-02 12:56:43 +09:00
artica d40c4e288d Auto-updated build strings. 2016-09-02 00:01:35 +02:00
m-lopez-f 885f15f2d0 When click in management permmision autoclicked in inferior options of same part. Ticket: #3912 
(cherry picked from commit a0753238f7)
 2016-09-01 15:58:22 +02:00
m-lopez-f 81769c3f5e Fixed problems with styles in visual console. Internal Ticket: #3985 
(cherry picked from commit 8892009211)
 2016-09-01 12:03:16 +02:00
m-lopez-f fb4a1b263a Add style css to image and fixed problems in metaconsole when grouped by agents in events. Internal ticket: #3079 
(cherry picked from commit 02388ff31f)
 2016-09-01 10:51:10 +02:00
artica eb8e730f32 Auto-updated build strings. 2016-09-01 00:01:36 +02:00
fbsanchez d9b61cf1f9 postinstall edited #3594 
to match ubuntu >= 14 new folder tree
 2016-08-31 17:56:34 +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
m-lopez-f 269b4365a6 Fixed problems with sql in metaconsole when used group agents in events list. Ticket: #3079 
(cherry picked from commit 051ee37696)
 2016-08-31 14:44:12 +02:00
m-lopez-f 498ad5f42c Fixed problems with line father when use pure in visual console. Internal ticket: #3936 
(cherry picked from commit e815ea022b)
 2016-08-31 14:40:30 +02:00
fermin831 3ef4ea3215 Changed require for include 2016-08-31 12:08:50 +02:00
artica d0f59acaef Auto-updated build strings. 2016-08-31 00:01:35 +02:00
fbsanchez 77ed3ae3fc Fixed double include (functions_modules.php) 2016-08-30 13:56:51 +02:00
axl89 dcd6e1f6a4 Updated english translations 
(cherry picked from commit 9f22e7fec0)
 2016-08-30 13:06:51 +02:00
fermin831 c903e45ff0 RSS menu does not appear if IP is not in white API IP list 
(cherry picked from commit 7462ff1ece)
 2016-08-30 10:49:56 +02:00
artica 46798f833a Auto-updated build strings. 2016-08-30 00:01:40 +02:00
Daniel Maya 33c63526b1 Fixed problem with the permissions of the visual console. Ticket #4000. 
(cherry picked from commit e21eabbf04)
 2016-08-29 16:07:47 +02:00
m-lopez-f fc4874fbd0 Fixed problems with menu. Internal Ticket: #3912 2016-08-29 13:25:00 +02:00
fbsanchez 5acdabe5f2 Fixed minor issue: url of image resource while installing 
changed IP reference to global reference
 2016-08-29 13:14:50 +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
fbsanchez 3891be0bc2 Fixed minor issue: url of image resource while installing 2016-08-29 12:54:22 +02:00
m-lopez-f d6f75b7880 Fixed problems with thresholded in interactive graphs. Internal Ticket: #3777 
(cherry picked from commit 794275a13c)
 2016-08-29 12:36:08 +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 ac25696355 Fixed search form. Tiquet: #3988 2016-08-29 09:47:29 +02:00
artica 28fbddd891 Auto-updated build strings. 2016-08-29 00:02:42 +02:00
artica f52b93985e Auto-updated build strings. 2016-08-28 00:02:21 +02:00
artica ed2517600a Auto-updated build strings. 2016-08-27 00:02:54 +02:00
Daniel Maya e956b90a1e added default fontpath for windows. Ticket #3316. 
(cherry picked from commit 7dbc641404)
 2016-08-26 12:45:12 +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
artica f83927852c Auto-updated build strings. 2016-08-26 00:02:11 +02:00
fbsanchez 95b162f63a Ticket Integria: 3951 Changed workaround to generate api module graphs #31 2016-08-25 20:16:03 +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
artica 1064880726 Auto-updated build strings. 2016-08-25 00:02:23 +02:00
daniel 008e610cc7 ticket integria: 3992 fixed error in report avaibility #29 
(cherry picked from commit aeb99780ff)
 2016-08-24 17:20:10 +02:00
m-lopez-f f0c34fb301 Fixed search form. Tiquet: #3988 2016-08-24 15:38:20 +02:00
m-lopez-f 5d89aea854 Fixed problems with times of execution and load page. Tiquet: #3988 2016-08-24 11:03:17 +02:00
artica d3e0784b70 Auto-updated build strings. 2016-08-24 00:02:02 +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
artica 5d9609e34d Auto-updated build strings. 2016-08-23 00:01:51 +02:00
artica 35649a50c4 Auto-updated build strings. 2016-08-20 00: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 f2918a2093 Fixed simple graph in custom report. Don't create a simple graph without avg 
(cherry picked from commit bf41048018)
 2016-08-18 10:29:28 +02:00
daniel 5b2530721e Ticket integria: 3909 fixed name export csv #26 
(cherry picked from commit 6a9fd3805a)
 2016-08-18 09:30:29 +02:00
artica e370bc8509 Auto-updated build strings. 2016-08-18 00:01:40 +02:00
m-lopez-f ff512260ad Fixed problems in DB Status, in information of sql statements. GitHub: #57 
(cherry picked from commit 07234fa087)
 2016-08-17 15:42:29 +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
artica cc2be5f697 Auto-updated build strings. 2016-08-17 00:01:31 +02:00
daniel a311a060a1 ticket integria: 3981 fixed error in autentication active directory download collections #23 
(cherry picked from commit a38114ee65)
 2016-08-16 15:36:29 +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
m-lopez-f 2294d825e3 Fixed problems with parents lines objects. Tiquet: #3936 
(cherry picked from commit 0d8761d009)
 2016-08-16 12:16:50 +02:00
m-lopez-f 774b0f9cab Fixed problems with group agents. Tiquet: #3079 2016-08-16 10:43:29 +02:00
artica 65b3a1e73a Auto-updated build strings. 2016-08-16 00:02:18 +02:00
artica 6f0e9458cd Auto-updated build strings. 2016-08-15 00:01:35 +02:00
artica 6ad4cfa298 Auto-updated build strings. 2016-08-14 00:01:46 +02:00
artica 05bc394b24 Auto-updated build strings. 2016-08-13 00:01:42 +02:00
daniel 3a4826bb5f ticket integria: 3956 #22 
(cherry picked from commit 9ff35c28f3)
 2016-08-12 13:37:46 +02:00
axl89 689a867f3b Added default MYSQL_DATABASE environment variable 2016-08-12 13:02:57 +02:00
daniel 787e44e7f9 ticket integria: 3938 fixed error in report change max for min #20 
(cherry picked from commit c58bc9e365)
 2016-08-12 09:33:37 +02:00