Commit Graph

10022 Commits

Author SHA1 Message Date
Alejandro Gallardo Escobar 9c7cfad44f Fixed some schema errors 2015-05-11 14:15:47 +02:00
Alejandro Gallardo Escobar 4cb968782c Now the time to is different than the time from in the oncle time task 2015-05-11 14:14:30 +02:00
artica 1cc02b9013 Auto-updated build strings. 2015-05-11 00:01:11 +02:00
artica a815e04f07 Auto-updated build strings. 2015-05-10 00:01:12 +02:00
artica 7c6934ff39 Auto-updated build strings. 2015-05-09 00:01:11 +02:00
Alejandro Gallardo Escobar 6af3133d42 Fixed some error 2015-05-08 16:09:12 +02:00
m-lopez-f 9921304417 Fixed problems withs path in windows, tiquets: #2153,#2114 2015-05-08 09:51:53 +02:00
artica 3973044aa1 Auto-updated build strings. 2015-05-08 00:01:13 +02:00
Alejandro Gallardo Escobar f93e861369 Improved the output of the automatic config file 2015-05-07 18:36:25 +02:00
mdtrooper def5a597a2 Fixed the image for the 'simple_graph' in the enterprise pdf reports. 2015-05-07 17:05:50 +02:00
m-lopez-f 8b84b82a09 Add commands to execute in windows server for real time graphs. Tiquet:#2191
(cherry picked from commit cc7fcf71b3)
2015-05-07 16:02:38 +02:00
m-lopez-f a43bfd5d5a Delete order by Data column in main data agent. tiquet: #2060 2015-05-07 08:53:37 +02:00
artica 4b7047d9a8 Auto-updated build strings. 2015-05-07 00:01:14 +02:00
mdtrooper 0ec32cc826 Fixed the PHP Warnings about the re-start the session.
(cherry picked from commit 1a035873dc)
2015-05-06 18:43:10 +02:00
mdtrooper 1a035873dc Fixed the PHP Warnings about the re-start the session. 2015-05-06 18:42:42 +02:00
mdtrooper c46bdc5087 Fixed the lost value for the config max_file_size.
(cherry picked from commit d2e57f2ec8)
2015-05-06 18:29:20 +02:00
mdtrooper d2e57f2ec8 Fixed the lost value for the config max_file_size. 2015-05-06 18:28:46 +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 174726e253 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-05-06 16:39:37 +02:00
mdtrooper c7108cce46 Changes in the code for the report in the dashboard. 2015-05-06 16:31:10 +02:00
mdtrooper 94313bb249 Fixed the lost default parameter in the function. 2015-05-06 16:28:57 +02:00
mdtrooper 249e2e730d Working in the refactoring the code of reports (SLA_services). 2015-05-06 13:24:29 +02:00
m-lopez-f 50e6fd2bab Fixed error when load data in action alert in manage alerts, tiquet: #2088 2015-05-06 13:09:45 +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
artica 6f308321d4 Auto-updated build strings. 2015-05-06 00:01:12 +02:00
Ramon Novoa 0dd42fd1e0 Merge branch 'features/oracle' of https://github.com/pandorafms/pandorafms into features/oracle 2015-05-05 15:36:06 +02:00
Alejandro Gallardo Escobar 7bbd94843f Changed a type 2015-05-05 16:57:39 +02:00
Ramon Novoa c5f70a468c Changed some default values in pandoradb.oracle.sql. 2015-05-05 15:35:47 +02:00
Ramon Novoa 550f834e34 Oracle related fixes. 2015-05-05 15:34:03 +02:00
Alejandro Gallardo Escobar 2396ba4d9d Added a missing serial and trigger 2015-05-05 14:05:04 +02:00
mdtrooper c2fdcbb1d8 Working in the refactoring the code of reports (SLA_monthly). 2015-05-05 13:15:10 +02:00
Ramon Novoa 615231eafd More Oracle related fixes. 2015-05-05 11:57:50 +02:00
Ramon Novoa 6255d5c3bf Several fixes to support Oracle. 2015-05-05 11:20:41 +02:00
artica 5dc2b6be17 Auto-updated build strings. 2015-05-05 00:01:14 +02:00
Alejandro Gallardo Escobar 65a425859e Error fixes 2015-05-04 21:18:38 +02:00
Alejandro Gallardo Escobar c02f3bacf4 Error fixes related with the improved oracle compatibility 2015-05-04 20:11:03 +02:00
Alejandro Gallardo Escobar 7ae97fa48b Added a new function to sort an associative array by key 2015-05-04 20:10:13 +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
Ramon Novoa af118fd4b0 Removed debug messages. 2015-05-04 17:08:05 +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 c2ce4fddf4 fixed distance to show box data to graph in agent view, tiquet: #2161 2015-05-04 16:34:25 +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 0b59266a61 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-05-04 15:45:17 +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 57a9d4615c Renamed a table due to the character limitation in oracle 2015-05-04 14:41:40 +02:00
Ramon Novoa cf6a26a0b5 Fixed a call to enterprise_include_once (was called before
ENTERPRISE_DIR was set).
2015-05-04 14:15:35 +02:00