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

9073 Commits

Author SHA1 Message Date
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