10013 Commits

Author SHA1 Message Date
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
Ramon Novoa
2b698e5f35 Added a missing include.
(cherry picked from commit 641600c9ef89f117e08f0a6a01c6fe66e05539c7)
2015-05-18 11:06:23 +02:00
mdtrooper
34b3557e9e Merge branch 'develop' into feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES 2015-05-18 10:46:27 +02:00
Sancho Lerena
bc2d8b3957 Fixed stupid typo on operation to show total available memory
(cherry picked from commit cfc0583167ccdfb345df656e298334af54b94c01)
2015-05-18 09:54:44 +02:00
artica
94fc0c72bb Auto-updated build strings. 2015-05-18 00:01:11 +02:00
artica
26c2e22b1c Auto-updated build strings. 2015-05-17 00:01:09 +02:00
artica
dd60a6ad3f Auto-updated build strings. 2015-05-16 00:01:10 +02:00
artica
c1fffcfc4f Auto-updated build strings. 2015-05-15 00:01:15 +02:00
Alejandro Gallardo Escobar
95428eea4d Removed the .bak files and an auto generated file for the chat functionality 2015-05-14 18:19:41 +02:00
Alejandro Gallardo Escobar
eb965ff7da Fixed the data retrieving with oracle databases 2015-05-14 17:57:59 +02:00
mdtrooper
4387c36bbf Some fixed for the enterprise PDF reports. 2015-05-14 17:26:49 +02:00
mdtrooper
98d9032034 Some fixed for the enterprise PDF reports. 2015-05-14 16:21:04 +02:00
mdtrooper
60d301944d Some fixed for the enterprise PDF reports. 2015-05-14 15:52:55 +02:00
mdtrooper
fadeaef80a Some fixed for the enterprise PDF reports. 2015-05-14 13:17:59 +02:00
Alejandro Gallardo Escobar
b00c424af4 Fixed a lot of things, like the catastrophic problem with the sequences and the insertion triggers 2015-05-14 12:22:36 +02:00
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
mdtrooper
e005a352ab Some fixes for the enterprise PDF reports. 2015-05-13 13:55:54 +02:00
m-lopez-f
9cebf8ee34 This is more effective code from fixed bug, tiquet: #2216
(cherry picked from commit 4a52fcff58ebfca1fff934118f5fadb68a018e89)
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
mdtrooper
9e75cce59f Some changes and fixed for the reports in PDF. 2015-05-12 18:18:48 +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
mdtrooper
7ce25e9627 Some changes and fixed for the reports in PDF. 2015-05-12 16:41:08 +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 43bd6e010921e728af61d87d593096e8e0acea0f.
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 3b3c61aa2e2115d82f5af7050c885f38dfcbe84c)
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