tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 16:24:54 +02:00
Code Issues Packages Projects Releases Wiki Activity
9,438 Commits 34 Branches 30 Tags
Commit Graph

9438 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
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 567b5125bdc4a1407c5ae4709a2301455bcbb9ee)
 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
Vanessa Gil
52d16c9676 Merge branch 'feature/2017' into develop 2015-03-20 13:19:44 +01:00
Vanessa Gil
da3429bbce Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-03-20 13:19:11 +01:00
Vanessa Gil
dde47123ba Fixed bug #2017. 2015-03-20 13:18:22 +01:00
m-lopez-f
ecaf565bbc Fixed visual metaconsole in list of events 2015-03-20 08:33:53 +01:00
artica
a4084db68d Auto-updated build strings. 2015-03-20 00:01:07 +01:00
artica
b5eed86c42 Auto-updated build strings. 2015-03-19 00:01:10 +01:00
Vanessa Gil
819ee73a28 Fixed bug #2007 2015-03-18 18:07:14 +01:00
mdtrooper
c525de71fd Fixed the delete events in metaconsole. TICKET: #2016 2015-03-18 17:57:04 +01:00
Ramon Novoa
cb845a0a9b Merged Junichi's patch and added support for setting the number of ICMP 
packets.

(cherry picked from commit d4f8af2a56945afc97c8e5d325b92681e26398c5)
 2015-03-18 16:28:54 +01:00
mdtrooper
10156ffa77 Working in the refactor the code of reports. 2015-03-18 13:51:14 +01:00
m-lopez-f
c287a2064a Changed style to visualice data in 'Group view' tiquet: #1879 2015-03-18 13:11:30 +01:00
m-lopez-f
6c1b434565 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-03-18 11:46:49 +01:00
m-lopez-f
912462c71a Solvented visualization of group in few views, tiquet: #1946 2015-03-18 11:46:27 +01:00
mdtrooper
868d1d5b39 Cleaned source code style. 2015-03-18 10:58:31 +01:00