Commit Graph

9778 Commits

Author SHA1 Message Date
Alejandro Gallardo Escobar 55d1b04f74 Removed some conflictive characters 2015-05-14 12:16:54 +02:00
Alejandro Gallardo Escobar d212fd5543 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-05-14 11:09:37 +02:00
artica d199846972 Auto-updated build strings. 2015-05-14 00:01:11 +02:00
Junichi Satoh 8a63bc171d Fixed module configuration error with open version (without enterprise). 2015-05-13 21:56:43 +09:00
m-lopez-f 9cebf8ee34 This is more effective code from fixed bug, tiquet: #2216
(cherry picked from commit 4a52fcff58)
2015-05-13 10:15:44 +02:00
m-lopez-f dc5deadcd4 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-05-13 09:44:52 +02:00
m-lopez-f 4c7e526494 Fixed problems with generate custom events with alerts. Tiquet: #2216 2015-05-13 09:44:43 +02:00
artica 7d8fe9508b Auto-updated build strings. 2015-05-13 00:01:15 +02:00
Alejandro Gallardo Escobar 11fb9fb6e2 Many fixes and improvements in the management of the recontasks 2015-05-12 18:20:00 +02:00
Alejandro Gallardo Escobar 17c3de2b2f Fixes related with the oracle support 2015-05-12 18:19:08 +02:00
m-lopez-f 27013cb6e7 Fixed generate data and visual of visual console when user used wizard, tiquet: #2196 2015-05-12 16:46:42 +02:00
Ramon Novoa 2322b07c77 Read dbengine from pandora_server.conf before connecting to the DB. 2015-05-12 16:30:05 +02:00
m-lopez-f b6c49949e4 Revert "Fixed generate data and visual of visual console when user used wizard, tiquet: #2196"
Problems with funcionality of visualconsole

This reverts commit 43bd6e0109.
2015-05-12 12:09:07 +02:00
m-lopez-f 43bd6e0109 Fixed generate data and visual of visual console when user used wizard, tiquet: #2196 2015-05-12 11:08:43 +02:00
artica d771989313 Auto-updated build strings. 2015-05-12 00:01:12 +02:00
Alejandro Gallardo Escobar b853d29c33 Little fix related with the oracle support 2015-05-11 21:22:27 +02:00
Alejandro Gallardo Escobar a106111186 Refactored the procedure 'insert_id' to make it safe for insertions without sequences in oracle 2015-05-11 20:55:58 +02:00
Alejandro Gallardo Escobar e3ccfb95fe Refactored to fix some errors and improve the scalability 2015-05-11 20:54:23 +02:00
m-lopez-f 4a8952d6ec Fixed error when installing agent in windows, tiquet: 2157
(cherry picked from commit 3b3c61aa2e)
2015-05-11 14:44:26 +02:00
Alejandro Gallardo Escobar 4ce7de723a Now the db schema of this extension is created by processing a sql file 2015-05-11 14:18:18 +02:00
Alejandro Gallardo Escobar f0fe255f48 Added functions to process sql scripts to add data to the pandora database 2015-05-11 14:17:08 +02:00
Alejandro Gallardo Escobar e47af5993f Minor fix 2015-05-11 14:16:44 +02:00
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
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 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 174726e253 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-05-06 16:39:37 +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
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