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

2131 Commits

Author SHA1 Message Date
m-lopez-f 83a88d7a91 Fixed maps in Windows. Tiquet: #2153 
(cherry picked from commit 298b509b97)
 2015-06-23 15:15:03 +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
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 2df8fab33a)
 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
Alejandro Gallardo Escobar d212fd5543 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-05-14 11:09:37 +02:00
Alejandro Gallardo Escobar 6af3133d42 Fixed some error 2015-05-08 16:09:12 +02:00
mdtrooper 73e0a74a1a Merge branch 'develop' into feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES 
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.item_editor.php
	pandora_console/include/functions_reporting.php
 2015-05-06 17:02:40 +02:00
mdtrooper c7108cce46 Changes in the code for the report in the dashboard. 2015-05-06 16:31:10 +02:00
m-lopez-f f5b26f69e6 Add unit to legend left in graph of interface information, tiquet: #2194 
(cherry picked from commit 277eb655a1)
 2015-05-06 13:04:45 +02:00
Alejandro Gallardo Escobar c95f70dde7 Error fixes related with the improved oracle compatibility 2015-05-04 18:27:23 +02:00
Alejandro Gallardo Escobar 758e11b5b0 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-05-04 17:40:30 +02:00
Alejandro Gallardo Escobar a98be1cad9 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-05-04 17:28:42 +02:00
Alejandro Gallardo Escobar b78dbf1c0d Merge remote-tracking branch 'origin/develop' into features/oracle 2015-05-04 16:44:40 +02:00
m-lopez-f c3026d70a4 Fixed error en menu, not show option 2015-05-04 15:59:31 +02:00
m-lopez-f 6b974efe19 Merge branch 'feature/NewView' into develop 2015-05-04 15:45:34 +02:00
m-lopez-f 6241ae13d6 Add new option, when is active data of modules type is proc, show ok or fail. Tiquet: #1996 2015-05-04 15:44:37 +02:00
Alejandro Gallardo Escobar 3cd0dd60a3 Disabled a search filter when using an oracle database 2015-05-04 14:51:06 +02:00
Alejandro Gallardo Escobar 1121fbd8b7 Fixed problems related with the oracle compatibility 2015-04-30 20:11:07 +02:00
Alejandro Gallardo Escobar 3264c65ef8 Fixed some problems with oracle compatibility 2015-04-30 12:35:42 +02:00
m-lopez-f 40a9958905 Delete option, in home screen, only in insterprise servers. Tiquet: #2128 
(cherry picked from commit c3b60812e0)
 2015-04-30 08:49:41 +02:00