tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-28 05:08:47 +02:00
Code Issues Packages Projects Releases Wiki Activity
32,402 Commits 34 Branches 30 Tags
Commit Graph

17573 Commits

Author SHA1 Message Date
m-lopez-f
66c1e06b03 Merge branch 'develop' into feature/NewView 2015-06-16 16:57:58 +02:00
m-lopez-f
ff1186ee57 Changed visual of console 2015-06-16 16:09:50 +02:00
mdtrooper
72ee6158fa Fixes for the Oracl€. 2015-06-16 14:42:17 +02:00
artica
c7f6c17eb7 Auto-updated build strings. 2015-06-16 00:01:12 +02:00
mdtrooper
fad6a1e52d Fixes for the Oracl€. 2015-06-15 17:43:02 +02:00
m-lopez-f
9544dec1ac Change visual of console 2015-06-15 15:50:28 +02:00
m-lopez-f
2f5596ed9e Merge branch 'develop' into feature/NewView 2015-06-15 13:23:12 +02:00
artica
b0dbffd0c1 Auto-updated build strings. 2015-06-15 00:01:09 +02:00
artica
be56f5d6da Auto-updated build strings. 2015-06-14 00:01:10 +02:00
artica
7ecc100a1d Auto-updated build strings. 2015-06-13 00:01:13 +02:00
m-lopez-f
9e528d0459 Change visual of console 2015-06-12 15:50:46 +02:00
Alejandro Gallardo Escobar
6e3b32d60d Fixed an error retrieving data when using oracle 2015-06-12 13:58:39 +01:00
mdtrooper
8cf8a65bd3 Fixes for the Oracl€. 2015-06-12 14:39:18 +02:00
Alejandro Gallardo Escobar
745445d6d4 Fixed an error on oracle 2015-06-12 13:05:33 +01:00
artica
764b85c1a1 Auto-updated build strings. 2015-06-12 00:01:14 +02:00
mdtrooper
9789eca1e1 Added the feature to set module charts painting with lines or area. TICKET: #1849 2015-06-11 21:24:14 +02:00
mdtrooper
19f74c8e78 Fixed misplaced function in functions_reporting_html.php 2015-06-11 21:23:11 +02:00
mdtrooper
0be8792b01 Killing unicorns and magic numbers. 2015-06-11 20:45:40 +02:00
mdtrooper
37a7cf6cf2 Some fixes in the code. 2015-06-11 20:17:54 +02:00
Alejandro Gallardo Escobar
11d50f06ba Removed some jQuery.ajax() 'timeout: 10000' and 'async: false' properties 2015-06-11 12:08:14 +02:00
Alejandro Gallardo Escobar
04c8348042 Minor improvements 2015-06-11 12:08:02 +02:00
Alejandro Gallardo Escobar
abc426bc4d Improved the agent search for the metaconsole 2015-06-11 11:02:17 +02:00
artica
936264d337 Auto-updated build strings. 2015-06-11 00:01:12 +02:00
Alejandro Gallardo Escobar
5751666f45 Improved the function "oracle_db_format_array_where_clause_sql" by adding more checks 2015-06-10 17:39:46 +02:00
Alejandro Gallardo Escobar
b02d381205 Merge branch 'features/oracle' of https://github.com/pandorafms/pandorafms into features/oracle 2015-06-10 15:41:27 +02:00
Alejandro Gallardo Escobar
25dde2c836 Fixes to improve the oracle compatibility 2015-06-10 15:40:59 +02:00
mdtrooper
dbc6893747 Fixed the list of items in the report editor. 2015-06-10 15:20:48 +02:00
artica
28f10174d4 Auto-updated build strings. 2015-06-10 00:01:12 +02:00
mdtrooper
458d9909d4 Now in the function 'filemanager_read_recursive_dir' returns the directories 
(cherry picked from commit ae97ad964d21f9dcae5aab856792741de1eb6c5c)

Conflicts:
	pandora_console/include/functions_filemanager.php
 2015-06-09 15:55:59 +02:00
artica
a8aa6f18d6 Auto-updated build strings. 2015-06-09 00:01:14 +02:00
mdtrooper
7574f6ed09 Clean the source code style. 2015-06-08 13:13:09 +02:00
mdtrooper
89cac169f4 Clean the source code style. 2015-06-08 11:05:19 +02:00
Alejandro Gallardo Escobar
042301b337 Added a new config parameter 2015-06-08 10:48:38 +02:00
mdtrooper
819b1d5d77 Clean the source code style. 2015-06-08 09:32:01 +02:00
mdtrooper
b96fdad6d8 Sanitized the project (clean code and removed the deprecated htmLaWed) 2015-06-08 09:18:00 +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
mdtrooper
371aafa3fa Fixes for the Oracl€. 2015-06-05 14:47:50 +02:00
mdtrooper
4a86e40ca2 Fixed the PHP Warning about the config var. (manual cherry-pick from e326c8ff2013765a3c0bf2215eceea66b9eb453a) 2015-06-05 12:52:18 +02:00
m-lopez-f
866cdb908e No show count events group by status(validate,not validate) in statics events. Tiquet: #2306 2015-06-05 10:21:24 +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
Ramon Novoa
38c90b43d1 Do not draw parent/child relationships in layer 2 maps. 
(cherry picked from commit 16c2e10a4fa5279fcf60de4daa525c30c98b3981)
 2015-06-03 17:21:16 +02:00
mdtrooper
a9675820b9 Fixes for the Oracl€. 2015-06-03 17:00:28 +02:00
mdtrooper
3ca9a23d0a Fixes for the Oracl€. 2015-06-03 15:53:52 +02:00
artica
51e76a0289 Auto-updated build strings. 2015-06-03 00:01:12 +02:00
mdtrooper
9bba19235e Merge branch 'features/oracle' of https://github.com/pandorafms/pandorafms into features/oracle 2015-06-02 19:10:15 +02:00
mdtrooper
11d2b66b30 Fixes for the Oracl€. 2015-06-02 19:10:11 +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