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

9452 Commits

Author SHA1 Message Date
mdtrooper 6d07408af8 Manual (by hand) cherry pick of commit f450d95278 2015-03-26 19:29:43 +01:00
mdtrooper 1a6a5539c1 Working in the refactoring the code of reports (summatory). 2015-03-26 11:29:10 +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
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 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
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
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
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 471492807d)
 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
Alejandro Gallardo Escobar 857d9e2e11 Fixed a PHP syntax error 2015-03-23 21:02:06 +01:00
Alejandro Gallardo Escobar e3c1acfcf4 Merge branch 'feature/ticket#1981-Direct-graphs' into develop 2015-03-23 20:58:41 +01:00
Alejandro Gallardo Escobar da8570d3b9 Added support to show the interface traffic graphs through the metaconsole and improved the ACL 2015-03-23 20:51:44 +01:00
Alejandro Gallardo Escobar 9b9a3797cd Added support to show the module graphs through the metaconsole 2015-03-23 20:05:07 +01:00
Alejandro Gallardo Escobar 7b2f02571c Now the metaconsole can show the graphs of their nodes 2015-03-23 19:51:59 +01:00
mdtrooper 2a832e5758 Fixed the querys with the string '0'. 2015-03-23 19:18:08 +01:00
mdtrooper b4e74e8502 Fixed the insert duplicate event filter. 2015-03-23 19:18:08 +01:00
m-lopez-f 75dbb4dcb9 Changed visual of metaconsole 2015-03-23 17:28:38 +01:00
m-lopez-f 97c39b5e12 Fixed problems when save a variable in visual setup and save text. Tiquet: #2002 2015-03-23 16:14:17 +01:00
mdtrooper bac907638f Fixed the list of custom fields in the fields event form editor after the update. 2015-03-23 15:42:12 +01:00
m-lopez-f 57d9c66b78 Fixed error php 2015-03-23 14:50:43 +01:00
m-lopez-f a22d3f5434 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-03-23 14:48:45 +01:00
m-lopez-f 581d5e9c5f Fixed list of data in report when user have strict_acl, tiquet: #2014 2015-03-23 14:48:27 +01:00
Alejandro Gallardo Escobar 7360171bd7 Adapted the functions to work with the metaconsole 
(cherry picked from commit 567b5125bd)
 2015-03-23 14:34:04 +01:00
mdtrooper 118b980f4e Fixed the view of list event filters with a user is setted strict_acl. #2017 2015-03-23 14:17:06 +01:00
mdtrooper 4d70cdd24a Fixed the view of list event filters with a user is setted strict_acl. #2017 2015-03-23 14:12:19 +01:00
m-lopez-f 5f32d18f06 Not show correct color in histogram, tiquet: #2008 2015-03-23 14:02:22 +01:00
m-lopez-f da659a1e84 Fixed problems with visual in metaconsole 2015-03-23 13:48:12 +01:00
m-lopez-f 1cd5b69227 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-03-23 13:39:08 +01:00
m-lopez-f 03c961f239 Change Visual metaconsole, simplify criteria tiquet: 2010 (Fixed problems php) 2015-03-23 13:38:59 +01:00
Ramon Novoa ca341f3a9d Delete validated events from tmetaconsole_event_history. 
(cherry picked from commit cfa87d834173287aa1ce58bfaf476beafeb342e8)
 2015-03-23 12:55:20 +01:00
m-lopez-f af2722ac51 Change Visual metaconsole, simplify criteria tiquet: 2010 (Fixed problems php) 2015-03-23 12:37:27 +01:00
m-lopez-f c8e48dcbe3 Change Visual metaconsole, simplify criteria tiquet: 2010 2015-03-23 12:25:02 +01:00
m-lopez-f f43698bfe7 Fixed visual metaconsole tiquet: 2013 2015-03-23 12:02:48 +01:00
mdtrooper e7b79a0a8f Working in the new feature. 2015-03-23 11:08:58 +01:00
artica 683f8b500c Auto-updated build strings. 2015-03-23 00:01:10 +01:00
artica f9b652867a Auto-updated build strings. 2015-03-22 00:01:09 +01:00
artica 9a9102d0ea Auto-updated build strings. 2015-03-21 00:01:11 +01:00
mdtrooper 21e0d423dc Merge branch 'develop' into feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES 2015-03-20 15:59:34 +01:00