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
|
60c486c62f
|
Resolved a pair of errors caused by undefined variables
|
2015-05-19 16:04:35 +02:00 |
artica
|
2896fb5324
|
Auto-updated build strings.
|
2015-05-19 00:01:15 +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
|
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 |
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
|
17c3de2b2f
|
Fixes related with the oracle support
|
2015-05-12 18:19: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 |
|
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 |
|
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 |
|
artica
|
3973044aa1
|
Auto-updated build strings.
|
2015-05-08 00:01:13 +02:00 |
|
artica
|
4b7047d9a8
|
Auto-updated build strings.
|
2015-05-07 00:01:14 +02:00 |
|
artica
|
6f308321d4
|
Auto-updated build strings.
|
2015-05-06 00:01:12 +02:00 |
|
Ramon Novoa
|
550f834e34
|
Oracle related fixes.
|
2015-05-05 15:34:03 +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
|
b78dbf1c0d
|
Merge remote-tracking branch 'origin/develop' into features/oracle
|
2015-05-04 16:44:40 +02:00 |
|
artica
|
b9ace11dda
|
Auto-updated build strings.
|
2015-05-04 00:01:09 +02:00 |
|
artica
|
8c2851cf7f
|
Auto-updated build strings.
|
2015-05-03 00:01:08 +02:00 |
|
artica
|
88bb073bca
|
Auto-updated build strings.
|
2015-05-02 00:01:10 +02:00 |
|
artica
|
2ef016b06e
|
Auto-updated build strings.
|
2015-05-01 00:01:12 +02:00 |
|
Ramon Novoa
|
a487fa011e
|
Execute all previously run actions when an alert recovers.
|
2015-04-30 13:47:02 +02:00 |
|
Ramon Novoa
|
9f69bb51db
|
Fixed a warning.
|
2015-04-30 11:18:44 +02:00 |
|
Ramon Novoa
|
38b1f4dc8f
|
Fixed the string quotation character for Oracle.
|
2015-04-30 10:51:47 +02:00 |
|
artica
|
0ce49f40b4
|
Auto-updated build strings.
|
2015-04-30 00:01:15 +02:00 |
|
artica
|
fd00915457
|
Auto-updated build strings.
|
2015-04-29 00:01:11 +02:00 |
|
Ramon Novoa
|
4f2aad5834
|
Added a schema comparison tool.
|
2015-04-28 16:00:46 +02:00 |
|
artica
|
3ee1cfacd9
|
Auto-updated build strings.
|
2015-04-28 00:01:15 +02:00 |
|
artica
|
9ef920de5f
|
Auto-updated build strings.
|
2015-04-27 00:01:09 +02:00 |
|
artica
|
5e6c70b9d0
|
Auto-updated build strings.
|
2015-04-26 00:01:08 +02:00 |
|
artica
|
576aed5356
|
Auto-updated build strings.
|
2015-04-25 00:01:14 +02:00 |
|
Alejandro Gallardo Escobar
|
33fac67ed9
|
Merge remote-tracking branch 'origin/develop' into feature/meta-agent-cache
|
2015-04-24 18:11:31 +02:00 |
|
artica
|
7dbf60d4ef
|
Auto-updated build strings.
|
2015-04-24 00:01:13 +02:00 |
|
Alejandro Gallardo Escobar
|
8a348c2411
|
Merge remote-tracking branch 'origin/develop' into feature/meta-agent-cache
|
2015-04-23 15:02:27 +02:00 |
|
artica
|
13b7d4a414
|
Auto-updated build strings.
|
2015-04-23 00:01:12 +02:00 |
|
artica
|
7812f2a965
|
Auto-updated build strings.
|
2015-04-22 00:01:28 +02:00 |
|
artica
|
d6e7abe8c6
|
Auto-updated build strings.
|
2015-04-21 00:01:16 +02:00 |
|
artica
|
4e0e988508
|
Auto-updated build strings.
|
2015-04-20 00:01:10 +02:00 |