tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-22 10:18:51 +02:00
Code Issues Packages Projects Releases Wiki Activity
18,684 Commits 34 Branches 30 Tags
Commit Graph

2879 Commits

Author SHA1 Message Date
Alejandro Gallardo Escobar
75ea601e67 Added the function "get_db_rows" and fixed other functions to improve their compatibility with annoying databases 2015-06-08 18:32:49 +02:00
artica
b7bf0dbc3a Auto-updated build strings. 2015-06-08 00:01:10 +02:00
artica
096a17be2e Auto-updated build strings. 2015-06-07 00:01:09 +02:00
artica
efa871b22b Auto-updated build strings. 2015-06-06 00:01:09 +02:00
artica
352d0e95ff Auto-updated build strings. 2015-06-05 00:01:09 +02:00
artica
4a4f04d833 Auto-updated build strings. 2015-06-04 00:01:10 +02:00
artica
51e76a0289 Auto-updated build strings. 2015-06-03 00:01:12 +02:00
Alejandro Gallardo Escobar
8fbe1175b5 Merge remote-tracking branch 'origin/develop' into features/oracle 
Conflicts resolved:
	pandora_console/DEBIAN/control
	pandora_console/DEBIAN/make_deb_package.sh
	pandora_console/include/config_process.php
	pandora_console/pandoradb.data.oracle.sql
 2015-06-02 18:08:46 +02:00
artica
bdda81b436 Auto-updated build strings. 2015-06-02 00:01:10 +02:00
artica
306c7f016a Auto-updated build strings. 2015-06-01 00:01:09 +02:00
artica
528c9f79f0 Auto-updated build strings. 2015-05-31 00:01:09 +02:00
artica
e4c9b07266 Auto-updated build strings. 2015-05-30 00:01:11 +02:00
artica
16fa2ec329 Auto-updated build strings. 2015-05-29 00:01:13 +02:00
artica
70cc8fbc8f Auto-updated build strings. 2015-05-28 00:01:10 +02:00
artica
eacb7300de Auto-updated build strings. 2015-05-27 00:01:14 +02:00
Alejandro Gallardo Escobar
d7801c2933 Merge remote-tracking branch 'origin/develop' into features/oracle 
Conflicts resolved:
	pandora_console/extensions/module_groups.php
	pandora_console/godmode/reporting/graph_builder.graph_editor.php
	pandora_console/operation/events/events_list.php
 2015-05-26 10:29:38 +02:00
artica
c0bc11e50a Auto-updated build strings. 2015-05-26 00:02:12 +02:00
artica
f51a36fd3d Auto-updated build strings. 2015-05-25 00:01:11 +02:00
artica
94e24f461a Auto-updated build strings. 2015-05-24 00:01:10 +02:00
artica
37361f53ae Auto-updated build strings. 2015-05-23 00:01:13 +02:00
artica
0ea32ce1dc Auto-updated build strings. 2015-05-22 00:01:13 +02:00
artica
bb934257e6 Auto-updated build strings. 2015-05-21 00:01:13 +02:00
artica
0dc669178b Auto-updated build strings. 2015-05-20 00:01:17 +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
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
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 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
17c3de2b2f Fixes related with the oracle support 2015-05-12 18:19:08 +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