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

5147 Commits

Author SHA1 Message Date
m-lopez-f
69bc104b99 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-06-30 17:06:15 +02:00
m-lopez-f
b880f8c726 Fixed style event list in metaconsole 2015-06-30 17:05:58 +02:00
Ramon Novoa
a9f2171cce Show system events in the metaconsole. 2015-06-30 16:48:32 +02:00
mdtrooper
def7a59a97 Cleaned source code style. 2015-06-30 16:29:39 +02:00
mdtrooper
2fd82b6ee5 Merge branch 'feature/ticket#1980-dynamic_reports' into develop 2015-06-29 13:26:14 +02:00
mdtrooper
cf5b850c3f Some fixes in the dynamic reports for metaconsole. 2015-06-29 13:18:55 +02:00
m-lopez-f
15fb6f20a4 Add new view when no have data in this view 2015-06-26 14:52:01 +02:00
m-lopez-f
58ea3ebb6b Change visual 2015-06-26 08:49:51 +02:00
mdtrooper
247796ae8b Merge branch 'develop' into feature/ticket#1980-dynamic_reports 2015-06-25 16:02:27 +02:00
m-lopez-f
94c742bfbe Merge from Develop 2015-06-25 10:40:35 +02:00
m-lopez-f
5b4214277b Changed of visual 2015-06-25 10:07:53 +02:00
m-lopez-f
83a88d7a91 Fixed maps in Windows. Tiquet: #2153 
(cherry picked from commit 298b509b97f79bf88bca6985ce60a4be815b6232)
 2015-06-23 15:15:03 +02:00
mdtrooper
afecb459c5 Working in the enterprise feature dynamic reports. 2015-06-22 16:22:48 +02:00
mdtrooper
447c4ccd6d Some fixes in the code. 2015-06-22 16:10:15 +02:00
Alejandro Gallardo Escobar
9644a91b67 Fixed an error in the order of the parameters of a function 2015-06-19 12:11:11 +02:00
Alejandro Gallardo Escobar
3b037caf32 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-06-18 20:02:01 +02:00
Alejandro Gallardo Escobar
1905c8a038 Visual fixes into the alerts list 2015-06-16 17:54:19 +02:00
m-lopez-f
ff1186ee57 Changed visual of console 2015-06-16 16:09:50 +02:00
m-lopez-f
9544dec1ac Change visual of console 2015-06-15 15:50:28 +02:00
m-lopez-f
2f5596ed9e Merge branch 'develop' into feature/NewView 2015-06-15 13:23:12 +02:00
m-lopez-f
9e528d0459 Change visual of console 2015-06-12 15:50:46 +02:00
mdtrooper
9ad8b1035c Tiny feature, the slide form to config chart in the module chart window adapt to the height of window. 2015-06-11 20:19:50 +02:00
mdtrooper
37a7cf6cf2 Some fixes in the code. 2015-06-11 20:17:54 +02:00
Alejandro Gallardo Escobar
11d50f06ba Removed some jQuery.ajax() 'timeout: 10000' and 'async: false' properties 2015-06-11 12:08:14 +02:00
mdtrooper
7574f6ed09 Clean the source code style. 2015-06-08 13:13:09 +02:00
mdtrooper
89cac169f4 Clean the source code style. 2015-06-08 11:05:19 +02:00
mdtrooper
819b1d5d77 Clean the source code style. 2015-06-08 09:32:01 +02:00
Alejandro Gallardo Escobar
33129d89ce Instantiated an object (table) to avoid PHP warnings 2015-06-03 15:56:25 +02:00
Alejandro Gallardo Escobar
8fbe1175b5 Merge remote-tracking branch 'origin/develop' into features/oracle 
Conflicts resolved:
	pandora_console/DEBIAN/control
	pandora_console/DEBIAN/make_deb_package.sh
	pandora_console/include/config_process.php
	pandora_console/pandoradb.data.oracle.sql
 2015-06-02 18:08:46 +02:00
m-lopez-f
47a6c973d1 Add more width to select tags in filters events and truncate name. Tiquet: #2015 2015-05-28 10:34:10 +02:00
Alejandro Gallardo Escobar
09998429b7 Modified the alert messages the system stores in the user session 2015-05-27 16:01:52 +02:00
m-lopez-f
c02622bd53 Add order by column Description in Agents detail. Tiquet: #2272 2015-05-27 08:58:50 +02:00
Alejandro Gallardo Escobar
5906f6dd44 Re-fixed the agents filter 2015-05-26 12:07:13 +02:00
Alejandro Gallardo Escobar
d7801c2933 Merge remote-tracking branch 'origin/develop' into features/oracle 
Conflicts resolved:
	pandora_console/extensions/module_groups.php
	pandora_console/godmode/reporting/graph_builder.graph_editor.php
	pandora_console/operation/events/events_list.php
 2015-05-26 10:29:38 +02:00
mdtrooper
81a0a217b5 Fixed PHP Warnings 2015-05-25 13:31:10 +02:00
m-lopez-f
86db63f4f9 Fixed problems with name of dynamic's worksmap. tiquet: #2207 2015-05-25 12:55:18 +02:00
m-lopez-f
6dc62eccce Fixed problems with new code, not view unit in graph, tiquet: 2194 
(cherry picked from commit 2df8fab33a21a1227547b80bef8cc17320342963)
 2015-05-25 11:58:01 +02:00
Alejandro Gallardo Escobar
c5ca1a263c Fixed the filter management (load, save and update) 2015-05-22 17:48:58 +02:00
mdtrooper
fcd6927efb Fixed the empty list of events. 2015-05-22 15:00:06 +02:00
mdtrooper
83967d3526 Fixed PHP Warnings 2015-05-22 13:22:12 +02:00
mdtrooper
3d32d5645e Fixed the event list when it is setted the replication, now the info message show again. 2015-05-22 13:10:05 +02:00
mdtrooper
f009758e93 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-05-22 12:31:49 +02:00
mdtrooper
2fe85510a7 Fixed PHP Warnings. 2015-05-22 12:31:33 +02:00
Alejandro Gallardo Escobar
36180716ee Error fixes 2015-05-22 11:14:40 +02:00
m-lopez-f
d57ba03f19 Fixed problems with load events when selected all agents,tiquet: #2241 2015-05-21 13:01:44 +02:00
mdtrooper
1cb3399425 Fixed PHP Warnings and PHP notices (The PHP version 5.3.4 (the PHP version in new CentOS) and uppers are very noisy.) 2015-05-21 12:18:40 +02:00
Alejandro Gallardo Escobar
6c715cf483 Fixed the search to be compatible with oracle databases 2015-05-20 17:00:18 +02:00
Alejandro Gallardo Escobar
137acdb232 Merge remote-tracking branch 'origin/develop' into features/oracle 
Conflicts resolved:
	pandora_console/include/functions_reporting.php
 2015-05-19 19:16:35 +02:00
mdtrooper
bc6e585d83 Removed the debug trace 2015-05-18 16:11:54 +02:00
mdtrooper
36467aaa5e Working in the refactoring the code of reports. Removed the xml code. 2015-05-18 14:49:02 +02:00