9881 Commits

Author SHA1 Message Date
mdtrooper
6d07408af8 Manual (by hand) cherry pick of commit f450d95278f3f9b4d4e4d6566ace493071dd6a40 2015-03-26 19:29:43 +01:00
mdtrooper
b72af65bd0 Fixed the ajax of get modules when the user have profiles with tags and without tags. 2015-03-26 18:44:16 +01:00
m-lopez-f
c7b3104224 In alert command preview is not array but contain data, create textarea instead of select 2015-03-26 15:33:37 +01:00
Ramon Novoa
cfb676eb70 Fixed a string. 2015-03-26 15:21:49 +01:00
Ramon Novoa
cb29e3564d Added tag related functions to the CLI. 2015-03-26 13:41:27 +01:00
m-lopez-f
220ad47b3f Change menu and visual any views, tiquets: #1815,#1702 2015-03-26 13:12:48 +01:00
mdtrooper
1a6a5539c1 Working in the refactoring the code of reports (summatory). 2015-03-26 11:29:10 +01:00
m-lopez-f
7bca421a79 Fixed user list visual in metaconsole tiquet: #2042 2015-03-26 08:48:14 +01:00
artica
7acba25778 Auto-updated build strings. 2015-03-26 00:01:14 +01:00
Alejandro Gallardo Escobar
fa58fb25ed Added new columns to the table 'tnetwork_map' 2015-03-25 20:55:02 +01:00
Alejandro Gallardo Escobar
f462e38a7f Now the data handling of the function 'events_page_details' id done connected to the node when necessary 2015-03-25 19:57:34 +01:00
Alejandro Gallardo Escobar
08d93c8b28 Now the 'avg_only' option is enabled by default for the metaconsole users 2015-03-25 19:20:48 +01:00
Alejandro Gallardo Escobar
3b06988082 Fixed an ACL error on the 'tags_check_acl' and 'tags_check_acl_events' functions 2015-03-25 19:19:20 +01:00
mdtrooper
4924556a21 Working in the refactoring the code of reports (fixed max_value, added min_value and avg_value). 2015-03-25 18:28:58 +01:00
mdtrooper
13e78e44eb Working in the refactoring the code of reports (max_value). 2015-03-25 18:14:05 +01:00
mdtrooper
958b9c8ce3 Working in the refactoring the code of reports (url). 2015-03-25 17:19:13 +01:00
mdtrooper
bc791ad3be Working in the refactoring the code of reports (text). 2015-03-25 16:58:53 +01:00
mdtrooper
803c03956d Working in the refactoring the code of reports (custom_graph). 2015-03-25 16:44:39 +01:00
m-lopez-f
75d9d58c48 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-03-25 16:15:04 +01:00
m-lopez-f
c7fa8710ec Changed histogram of events in tactical view to metaconsole, tiquet: #2029 2015-03-25 16:14:47 +01:00
mdtrooper
d17fbbc3a9 Working in the refactoring the code of reports. 2015-03-25 15:30:36 +01:00
mdtrooper
b49b67be4d Working in the refactoring the code of reports. 2015-03-25 15:25:21 +01:00
mdtrooper
9d18fd6910 Fixed lost variable. 2015-03-25 13:04:11 +01:00
mdtrooper
786c6efa4b Fixed the style of status message when edit a filter and added more information in the messages.
(cherry picked from commit 085c4521d0a2c892676413a7cc81a23ca882177e)
2015-03-25 11:24:08 +01:00
Alejandro Gallardo Escobar
b945ee8892 ACL improvements for the module graphs 2015-03-25 12:26:16 +01:00
Alejandro Gallardo Escobar
de65702f9a Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-03-25 12:25:13 +01:00
mdtrooper
085c4521d0 Fixed the style of status message when edit a filter and added more information in the messages. 2015-03-25 11:22:22 +01:00
m-lopez-f
00ae340c87 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-03-25 10:31:50 +01:00
m-lopez-f
97bfae819c Change message when search and no find data. Tiquet: #2039 2015-03-25 10:31:32 +01:00
Vanessa Gil
ede2e3794a Merge branch 'feature/translations' into develop 2015-03-25 10:20:11 +01:00
Vanessa Gil
6987d75b41 Update translations. 2015-03-25 10:18:48 +01:00
m-lopez-f
ee17fad784 Add message when search in custom report and not found data, tiquet: #2030 2015-03-25 10:01:11 +01:00
m-lopez-f
f450d95278 Change title to events in tactical view in metaconsole, tiquet: #2005 2015-03-25 09:26:04 +01:00
artica
9994e08d7a Auto-updated build strings. 2015-03-25 00:01:13 +01:00
Alejandro Gallardo Escobar
b8282a5cb1 Added support to show the interface traffic graphs through the metaconsole and improved the ACL
(cherry picked from commit fa9db9010cac637088e2d8cfa4ef4904f4dd115c)
2015-03-24 19:15:46 +01:00
Alejandro Gallardo Escobar
481addb514 ACL improvements 2015-03-24 19:10:09 +01:00
Alejandro Gallardo Escobar
9b1a57a89d Fixed an error on the check acl functions 2015-03-24 19:08:43 +01:00
mdtrooper
62c5d57ca6 Working in the refactoring code of reporting. Added some items in html 2015-03-24 18:03:08 +01:00
mdtrooper
ceca482158 Working in the refactoring code of reporting. 2015-03-24 17:52:57 +01:00
mdtrooper
a5eaeb3ec9 Working in this feature (refactoring code of reporting) 2015-03-24 15:06:10 +01:00
m-lopez-f
0a0283df0c Delete submenu in massive operations. Tiquet: #2031 2015-03-24 14:20:10 +01:00
Ramon Novoa
0846236dd2 Show the translated enterprise string by default on the SNMP console.
(cherry picked from commit b3f5e76009ef8238fb60e0469083eee9e3b68493)
2015-03-24 13:19:07 +01:00
mdtrooper
34caeb13c2 Working in the new feature. 2015-03-24 11:47:39 +01:00
mdtrooper
0cadefa2f0 Fixed the previous merge with the 'develop' branch. 2015-03-24 11:36:40 +01:00
KIKUCHI Koichiro
77354a886e Fixed master server queries:
* safe_input is required for server_name
* Fixed wrong server_type specified in NetworkServer
2015-03-24 19:28:46 +09:00
mdtrooper
fdaa8865b2 Working in the code refactoring. 2015-03-24 11:01:19 +01:00
mdtrooper
bd607c0e61 Merge branch 'develop' into feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES
Conflicts:
	pandora_console/include/functions_reporting.php
2015-03-24 10:50:13 +01:00
m-lopez-f
c2dbc40155 same unit to snmp modules when unit not correct to module type, tiquet: #2025
(cherry picked from commit 471492807df2a3fb3653f8d9d5abc4af6a00636a)
2015-03-24 10:36:57 +01:00
artica
9915e22a11 Auto-updated build strings. 2015-03-24 00:01:11 +01:00
Alejandro Gallardo Escobar
bbb41ddff5 Fixed a PHP syntax error 2015-03-23 21:05:18 +01:00