8810 Commits

Author SHA1 Message Date
mdtrooper
43470ade1a Erased lost debug trace call. 2015-01-16 13:57:13 +01:00
m-lopez-f
a36b399b1f Merge branch 'pandora_5.1' of https://github.com/pandorafms/pandorafms into pandora_5.1 2015-01-16 13:10:16 +01:00
m-lopez-f
5c86b34adc Fixed error creating the url in, en Reporting>>Visual Console>>Show link to public Visual Console 2015-01-16 13:09:42 +01:00
mdtrooper
a91cde0748 Fixed the PHP warning with undefined var. TICKET: #1552
(cherry picked from commit 5a5abe8e5318383473657ec31b2e687cae19a598)
2015-01-16 13:04:48 +01:00
KIKUCHI Koichiro
1cc9937422 Fixed the bug that tree view in meta console does not work properly. 2015-01-16 20:17:12 +09:00
KIKUCHI Koichiro
f5e6be1dba Fixed typo 2015-01-16 20:17:11 +09:00
KIKUCHI Koichiro
7cf45f1b8c Small cleanup to prepare for the next changes. 2015-01-16 20:17:11 +09:00
m-lopez-f
9e14c5fb20 Change help hint in Create user in field 'Global Profile' 2015-01-16 12:10:14 +01:00
m-lopez-f
509bb00156 Merge branch 'pandora_5.1' of https://github.com/pandorafms/pandorafms into pandora_5.1 2015-01-16 11:47:50 +01:00
m-lopez-f
8f0156ac93 changed description to use script 2015-01-16 11:47:23 +01:00
artica
177dcf35a4 Auto-updated build strings. 2015-01-16 00:01:25 +01:00
mdtrooper
0c5f659412 Fixed the get data of module data list view with historic data base set on. TICKET: #1668
(cherry picked from commit 36e7b29a04d870f5ed0054112c52d4a69aa68ac5)
2015-01-15 16:39:47 +01:00
m-lopez-f
f9b35d6f56 fixed little problem 2015-01-15 16:29:57 +01:00
m-lopez-f
40c7c3b967 Error with cherry-pick, upload other change of push '8798d94' 2015-01-15 16:26:16 +01:00
m-lopez-f
8798d946e3 Changed ACL's permission in Networkmaps
visualization: RR (Report Read)
Edition: RW (Report Write)
Deletion: RW (only yours networkmaps), RM(any of its group, although he did not create it.)
(cherry picked from commit d34ce5aa9e15dceaf2b5e4fb0f610b8c86179fbf)

Conflicts:
	pandora_console/operation/agentes/networkmap_list.php
2015-01-15 16:06:49 +01:00
m-lopez-f
90d600a238 Fixed permissions error when validating alerts. 2015-01-15 09:44:02 +01:00
artica
b42287f37a Auto-updated build strings. 2015-01-15 00:01:24 +01:00
m-lopez-f
670611a162 changed visual form 2015-01-14 16:46:05 +01:00
m-lopez-f
261b4cd564 has been added to select other ips agent and improved form. 2015-01-14 15:39:15 +01:00
m-lopez-f
7424e37fa0 Changed text 'Module macros' to 'Custom macros' 2015-01-14 12:14:30 +01:00
artica
f3d7f0cc39 Auto-updated build strings. 2015-01-14 00:01:22 +01:00
mdtrooper
0e49221878 Added support for policies tags into the function 'tags_get_module_tags'. INCIDENT: #1644
(cherry picked from commit 512bedda451f5d558c51cdae86c870e0d52cb3a4)
2015-01-13 12:05:16 +01:00
m-lopez-f
cebaaeba8e Merge branch 'pandora_5.1' of https://github.com/pandorafms/pandorafms into pandora_5.1 2015-01-13 11:25:15 +01:00
m-lopez-f
a2dff604c8 Fixed small error in translation. 2015-01-13 11:24:48 +01:00
m-lopez-f
824d62a4f8 Revert "changed the text of the tooltips of the variables"
This reverts commit d518e222a00bcb88d5174ed3586fa61c1031cf87.
2015-01-13 11:23:24 +01:00
m-lopez-f
d518e222a0 changed the text of the tooltips of the variables 2015-01-13 11:20:57 +01:00
m-lopez-f
56a2fca966 Fixed small error in translation 2015-01-13 11:13:04 +01:00
m-lopez-f
757b065fd2 Added new tooltip to the field filter in SNMP-> SNMP Filters-> create 2015-01-13 11:09:37 +01:00
artica
6b0be6ad55 Auto-updated build strings. 2015-01-13 00:01:24 +01:00
mdtrooper
e04f94cb02 Fixed the topology networkmaps, sometimes the relationships of agents showed bad
(cherry picked from commit c726c0f9bdb40bc1787308260ac5f1ae84c5090c)
2015-01-12 16:42:24 +01:00
m-lopez-f
f37c9ab4c4 Add data to string variables to correct the problem when ordering. 2015-01-12 16:32:04 +01:00
m-lopez-f
607af5eb1e Change the variables in the array so that they can be translated 2015-01-12 15:54:30 +01:00
m-lopez-f
51d45f0db0 Add combox filter in search form, view: Manage Agents in Admistration 2015-01-12 15:31:14 +01:00
artica
cd85a998bb Auto-updated build strings. 2015-01-12 00:01:23 +01:00
artica
1662ae1217 Auto-updated build strings. 2015-01-11 00:01:22 +01:00
artica
414507092d Auto-updated build strings. 2015-01-10 00:01:24 +01:00
Ramon Novoa
8c1be0f361 Changed the default path for fping so that it works OOTB on CentOS.
(cherry picked from commit d5c299cbf2325b95710e7b4b42a1c0cde82519db)
2015-01-09 11:30:16 +01:00
artica
e26541681f Auto-updated build strings. 2015-01-09 00:01:24 +01:00
Sancho Lerena
00e3fbb849 Merge branch 'pandora_5.1' of https://github.com/pandorafms/pandorafms into pandora_5.1 2015-01-08 19:07:42 +01:00
Sancho Lerena
9fb1e879f3 Solved a problem with autorefresh URL. This fixes problem on refreshing the same URL for a long time (p.e: 4 hours). Problem was the filename was not passed, and this, in someway, makes the whole system to add parameters to the right until it too long and breaks it.
To avoid other problems, I've added a safe check to see if coming URL contains "index.php" before adding it. Tested on several subcomponents and works.
2015-01-08 19:05:43 +01:00
Ramon Novoa
c2f9df2d6c Added support for fping.
(cherry picked from commit 05390e7bd7be3c22a6c51deb8fc087c5727b2c3b)
2015-01-08 16:27:21 +01:00
artica
c51882583e Auto-updated build strings. 2015-01-08 00:01:23 +01:00
Ramon Novoa
136cc39fd4 Do not delete old data when the interval is set to 0.
(cherry picked from commit 52fde88494227e7d325cfb0453779a8b34778fe1)
2015-01-07 13:53:43 +01:00
artica
d316c38ec2 Auto-updated build strings. 2015-01-07 00:01:22 +01:00
artica
34ff08e24c Auto-updated build strings. 2015-01-06 00:01:24 +01:00
artica
6475ce6107 Auto-updated build strings. 2015-01-05 00:01:21 +01:00
artica
3e4a5abf0b Auto-updated build strings. 2015-01-04 00:01:23 +01:00
artica
4c853819c5 Auto-updated build strings. 2015-01-03 00:01:23 +01:00
artica
78312cd43b Auto-updated build strings. 2015-01-02 00:01:22 +01:00
artica
5787b36005 Auto-updated build strings. 2015-01-01 00:01:23 +01:00