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

9500 Commits

Author SHA1 Message Date
mdtrooper ab09716cd4 Working in the refactoring the code of reports (simple_baseline_graph). 2015-04-13 18:42:35 +02:00
mdtrooper e5332924b1 Working in the refactoring the code of reports (prediction_date). 2015-04-13 18:15:02 +02:00
mdtrooper b3ef779319 Working in the refactoring the code of reports (projection_graph). 2015-04-13 16:37:10 +02:00
mdtrooper f84863540f Merge from the pandora_5.1 branch to feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES branch the new report items (availability and time overlaped in the simple graphs). 2015-04-10 00:58:24 +02:00
mdtrooper 62c7ac463d Working in the refactoring the code of reports (agent_configuration). 2015-03-30 17:07:57 +02:00
mdtrooper aabec6784e Rever some changes from the previous merge. 2015-03-30 11:33:26 +02:00
mdtrooper f8e544b89e Merge branch 'develop' into feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES 
Conflicts:
	pandora_console/include/functions_reporting.php
 2015-03-30 11:09:13 +02:00
mdtrooper cc8305429e Manual (by hand) cherry pick from the commit 63d322244d 2015-03-30 10:52:58 +02:00
m-lopez-f ffd099c782 Changed for fixed visual of metaconsole 2015-03-30 10:17:35 +02:00
artica 1d21b164b8 Auto-updated build strings. 2015-03-29 00:01:09 +01:00
Alejandro Gallardo Escobar fd41fba3d8 Changed the behaviour of the network map tooltip info for the strict users 2015-03-27 14:32:31 +01:00
mdtrooper cf09a85cd2 Workin in the refactoring the code of reports, move some functions from functions_repoting_html.php to functions_reporting.php 2015-03-27 13:03:15 +01:00
mdtrooper 54916a8002 Working in the refactoring the code of reports (MTTR, MTBF, TTO). 2015-03-27 10:24:44 +01:00
artica c29c47dc09 Auto-updated build strings. 2015-03-27 00:01:12 +01:00
Alejandro Gallardo Escobar 3d84b80c52 Fixed an error on the function 'tags_get_user_module_and_tags' caused by a string=integer comparision 2015-03-26 22:28:18 +01:00
Alejandro Gallardo Escobar 12013f8263 Merge branch 'feature/ticket#2028-network-map' into develop 2015-03-26 21:22:51 +01:00
Alejandro Gallardo Escobar b99e777300 Fixed an error on the function"tags_get_all_user_agents" 2015-03-26 21:17:53 +01:00
mdtrooper 56f4f3dc52 Merge branch 'develop' into feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES 2015-03-26 19:47:52 +01:00
mdtrooper 99247f7286 Manual (by hand) cherry pick of commit c7fa8710ec 2015-03-26 19:39:11 +01:00
Alejandro Gallardo Escobar 63d322244d Added a new parameter to the modules retrieving by tag function 2015-03-26 19:34:56 +01:00
mdtrooper 6d07408af8 Manual (by hand) cherry pick of commit f450d95278 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
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 085c4521d0)
 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