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

9880 Commits

Author SHA1 Message Date
Alejandro Gallardo Escobar 3176cdfaee Minor fixes 2015-05-20 17:37:39 +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 143243636c Error fixes related with the improved oracle compatibility 2015-05-19 19:21:05 +02:00
Alejandro Gallardo Escobar 837667b441 Removed the information about the defined alerts for the metaconsole (again) 2015-05-19 19:20:09 +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
Alejandro Gallardo Escobar cfa52a655b Finally fixed the unknown modules error, fixing the function 'UNIX_TIMESTAMP', which now returns the UTC utimestamp 2015-05-19 18:58:29 +02:00
mdtrooper f2683594b5 Fixes in the new code of reports. 2015-05-19 17:36:47 +02:00
Alejandro Gallardo Escobar 60c486c62f Resolved a pair of errors caused by undefined variables 2015-05-19 16:04:35 +02:00
Ramon Novoa c32c167b6e Ask for the old password before letting a user renew his password. 
(cherry picked from commit 0840c20764)
 2015-05-19 11:38:30 +02:00
artica 2896fb5324 Auto-updated build strings. 2015-05-19 00:01:15 +02:00
Alejandro Gallardo Escobar 7e67287ee0 Fixed errors related with the oracle compatibility 2015-05-18 19:06:21 +02:00
Alejandro Gallardo Escobar b8f2daf6fa Improved the functions that return a value 2015-05-18 19:05:22 +02:00
Alejandro Gallardo Escobar f7867e3ce0 Fixed errors related with the oracle compatibility 2015-05-18 18:33:31 +02:00
Alejandro Gallardo Escobar 24aa40a726 Fixed errors related with the oracle compatibility 2015-05-18 18:08:14 +02:00
Alejandro Gallardo Escobar c5d80cd104 Added history database support to the function '*_get_value_filter' 2015-05-18 18:05:09 +02:00
mdtrooper 0a9ae10a8f Merge branch 'develop' into feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES 2015-05-18 16:25:22 +02:00
mdtrooper 45ea3dc3d9 Added json file icon. Thanks Carla. 2015-05-18 16:23:23 +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
Ramon Novoa 2b698e5f35 Added a missing include. 
(cherry picked from commit 641600c9ef)
 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 cfc0583167)
 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 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
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 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