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

7845 Commits

Author SHA1 Message Date
artica 8062934760 Auto-updated build strings. 2015-07-04 00:01:16 +02:00
m-lopez-f dffe94823a Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-07-03 16:03:04 +02:00
m-lopez-f 942333530c Not show navigation menu in others view. Restore nav 2015-07-03 16:02:43 +02:00
fbsanchez fb36c8d0a1 Style: customize graphs arrow's color 2015-07-03 14:56:29 +02:00
m-lopez-f 10a5dc5ffb Fixed style in events filters list 2015-07-03 14:55:12 +02:00
Alejandro Gallardo Escobar a512065c22 Now the modules SLA slicebar has a different color in the planned downtimes period 
Ticket #2341
 2015-07-03 13:16:30 +02:00
Alejandro Gallardo Escobar a62791e9c0 Encapsulated some code to format a date into an human readable string into a function 2015-07-03 12:51:47 +02:00
Alejandro Gallardo Escobar c0320fd160 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-07-03 12:45:45 +02:00
Alejandro Gallardo Escobar 306bfe2a54 Encapsulated some code to format a date into an human readable string into a function 2015-07-03 12:32:03 +02:00
m-lopez-f 98d51e7548 Change visual of nodo 2015-07-03 11:13:10 +02:00
m-lopez-f d6f5d52a65 Fixed problems with extension in new menu. Tiquet: #2364 2015-07-03 11:12:35 +02:00
Alejandro Gallardo Escobar 37b55517e1 Error fixes 2015-07-02 18:23:13 +02:00
m-lopez-f f3dd19a06d Change visual of nodo 2015-07-02 15:31:53 +02:00
m-lopez-f 5c6f66ba52 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-07-02 15:24:56 +02:00
m-lopez-f 8c3056eb79 Add legal text in files and change data 2015-07-02 15:24:39 +02:00
Alejandro Gallardo Escobar 5b36f3aacf Fixed an error on the filter 2015-07-02 13:11:24 +02:00
m-lopez-f 224f95466c Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-07-02 12:41:29 +02:00
m-lopez-f e16540a7e8 Restore column remote config 2015-07-02 12:38:45 +02:00
Alejandro Gallardo Escobar 58891bf50a Moved a table to fix an error and added the change to the migrate and the oracle and postgres files 2015-07-02 12:05:02 +02:00
m-lopez-f 1ee4df2d3a Delete nav in create reports, is useless 2015-07-02 11:44:59 +02:00
m-lopez-f b1567da12e Change order divs, because dont show right in view reports. Tiquet: #2317 2015-07-02 10:06:26 +02:00
m-lopez-f d7bd4773db Change visual of metaconsole 2015-07-02 08:54:21 +02:00
artica 2976a794d5 Auto-updated build strings. 2015-07-02 00:01:20 +02:00
Alejandro Gallardo Escobar 0fb9519441 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-07-01 17:16:42 +02:00
Alejandro Gallardo Escobar ca6fcce190 Fixes and improvements in the report items of sla type 2015-07-01 17:15:55 +02:00
m-lopez-f 03b617908b Change visual of metaconsole 2015-07-01 17:05:53 +02:00
m-lopez-f 78e60249a7 Change visual of metaconsole and console 2015-07-01 14:50:00 +02:00
Vanessa Gil 86010c8c07 Update translations. 2015-07-01 13:14:10 +02:00
m-lopez-f 09bcaa42f5 Change visual of metaconsole. 2015-07-01 11:27:37 +02:00
artica b2af250070 Auto-updated build strings. 2015-07-01 00:01:46 +02:00
m-lopez-f 69bc104b99 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-06-30 17:06:15 +02:00
m-lopez-f b880f8c726 Fixed style event list in metaconsole 2015-06-30 17:05:58 +02:00
Vanessa Gil 3d973710a3 Updated translations. 2015-06-30 17:00:35 +02:00
Ramon Novoa a9f2171cce Show system events in the metaconsole. 2015-06-30 16:48:32 +02:00
Ramon Novoa 91ffd584b9 Added back a column that was accidentally removed. 2015-06-30 16:34:07 +02:00
mdtrooper def7a59a97 Cleaned source code style. 2015-06-30 16:29:39 +02:00
Alejandro Gallardo Escobar dde4e21e60 Fixed an error with the group counters of the tree view 2015-06-30 16:14:50 +02:00
Alejandro Gallardo Escobar 0b2bdfa72d Improved the behaviour of the login page inputs 2015-06-30 15:48:54 +02:00
m-lopez-f 6f89828c76 Fixed problems to show groups fathers-childs in custom reports. Tiquet: #2351 2015-06-30 15:47:58 +02:00
Alejandro Gallardo Escobar ff55ac9d25 Error fix 2015-06-30 13:37:53 +02:00
Alejandro Gallardo Escobar 0549196ee5 Improved the styles of the offline update manager control to make it more pandora like 2015-06-30 13:20:20 +02:00
Alejandro Gallardo Escobar 21b7dc03b7 Merge branch 'feature/ticket#1862-Metaconsole-offline-um' into develop 2015-06-30 13:05:36 +02:00
Alejandro Gallardo Escobar a719100855 Improvements to add better compatibility with the metaconsole 2015-06-30 12:59:23 +02:00
artica 3928421049 Auto-updated build strings. 2015-06-30 00:01:26 +02:00
Alejandro Gallardo Escobar 7942c075d5 Added a modified a few icons for the area flot graph 2015-06-29 19:11:28 +02:00
Alejandro Gallardo Escobar f68ff57490 New feature: bulk operations with plugins. Ticket #2301. 2015-06-29 18:46:22 +02:00
Alejandro Gallardo Escobar 711775f6a6 Fixed a missing 'forced_title_callback' and improved the function which creates new macro rows 2015-06-29 18:46:22 +02:00
mdtrooper 3498e9e1e7 Killing some unicorns and magic numbers. 2015-06-29 16:49:48 +02:00
mdtrooper 2fd82b6ee5 Merge branch 'feature/ticket#1980-dynamic_reports' into develop 2015-06-29 13:26:14 +02:00
mdtrooper cf5b850c3f Some fixes in the dynamic reports for metaconsole. 2015-06-29 13:18:55 +02:00
m-lopez-f 53c2b4bae9 Change visual of plugin registration 2015-06-29 11:28:48 +02:00
m-lopez-f f88c2b4ce1 Only charge firts task when is console and not metaconsole 2015-06-29 10:43:03 +02:00
m-lopez-f 1b4ae0d26e Merge to feature/Newview 2015-06-29 10:39:05 +02:00
m-lopez-f 806962f2e5 Add new firts task and change text in other 2015-06-29 10:33:01 +02:00
artica d5380c67dd Auto-updated build strings. 2015-06-29 00:01:13 +02:00
artica 5394f3cc2c Auto-updated build strings. 2015-06-28 00:01:09 +02:00
artica 5e09c2bbf5 Auto-updated build strings. 2015-06-27 00:01:13 +02:00
m-lopez-f 06b56d80c8 Add new view when no have data in this view 
(cherry picked from commit 15fb6f20a4)
 2015-06-26 14:52:50 +02:00
m-lopez-f 15fb6f20a4 Add new view when no have data in this view 2015-06-26 14:52:01 +02:00
m-lopez-f 70db852326 Merge branch 'feature/NewView' into develop 2015-06-26 12:22:14 +02:00
m-lopez-f ba091112f6 Change visual and login page 2015-06-26 12:21:25 +02:00
mdtrooper 8fedb02afa Added the constant ERR_COULDNT_RESOLVE_HOST 
(cherry picked from commit 2b5d79b81c)
 2015-06-26 12:00:22 +02:00
mdtrooper 2b5d79b81c Added the constant ERR_COULDNT_RESOLVE_HOST 2015-06-26 11:59:32 +02:00
m-lopez-f 440687c0d7 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-06-26 11:46:58 +02:00
m-lopez-f 964b17644a Change visual 2015-06-26 11:20:08 +02:00
mdtrooper 87e60b80bc Fixed the call to io funcions in function 'config_update_value'. 
(cherry picked from commit 4c91ec9063)
 2015-06-26 10:33:27 +02:00
mdtrooper 4c91ec9063 Fixed the call to io funcions in function 'config_update_value'. 2015-06-26 10:31:09 +02:00
m-lopez-f 58ea3ebb6b Change visual 2015-06-26 08:49:51 +02:00
artica cc58757d2e Auto-updated build strings. 2015-06-26 00:01:16 +02:00
Alejandro Gallardo Escobar 7fac872fb8 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-06-25 16:17:32 +02:00
Alejandro Gallardo Escobar 4e8c85ec10 Fixes to the 'key' column of the 'tupdate_settings' table 2015-06-25 16:16:01 +02:00
mdtrooper 247796ae8b Merge branch 'develop' into feature/ticket#1980-dynamic_reports 2015-06-25 16:02:27 +02:00
mdtrooper 77e1acc613 Working in the dynamic reports, these are the last changes in the refactored code. Now I am going to check in metaconsole. 2015-06-25 16:01:10 +02:00
mdtrooper 315744f668 Some changes for to get the data of template from array. 2015-06-25 13:48:12 +02:00
m-lopez-f b3c0d99fd2 Merge branch 'develop' into feature/NewView 2015-06-25 10:49:45 +02:00
m-lopez-f 94c742bfbe Merge from Develop 2015-06-25 10:40:35 +02:00
m-lopez-f 5b4214277b Changed of visual 2015-06-25 10:07:53 +02:00
m-lopez-f 37d792e07c Change visual 2015-06-25 08:21:53 +02:00
artica 0ed704cc68 Auto-updated build strings. 2015-06-25 00:01:14 +02:00
Alejandro Gallardo Escobar 892f14794d Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-06-24 19:18:28 +02:00
Alejandro Gallardo Escobar c80ba963ed Added the awesome Underscore.js library 2015-06-24 19:16:58 +02:00
m-lopez-f 6a54b670d0 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-06-24 16:09:36 +02:00
m-lopez-f 89a4f63e89 Change text of label 2015-06-24 16:09:07 +02:00
Junichi Satoh fd29fbc325 Removed sqls for enterprise table. 2015-06-24 18:38:57 +09:00
artica 2569a46879 Auto-updated build strings. 2015-06-24 00:01:19 +02:00
m-lopez-f 2e618c4ef4 Fixed installer in Windows. Tiquet: #2327 2015-06-23 16:29:37 +02:00
mdtrooper d0a0b11440 Fixed call a oracle function. 
(cherry picked from commit 66f982d22f)
 2015-06-23 15:30:10 +02:00
mdtrooper 66f982d22f Fixed call a oracle function. 2015-06-23 15:27:58 +02:00
m-lopez-f 83a88d7a91 Fixed maps in Windows. Tiquet: #2153 
(cherry picked from commit 298b509b97)
 2015-06-23 15:15:03 +02:00
mdtrooper 8b518ae9b2 Fixed the masive operations for modules when the name has white spaces. TICKET: #2328 
(cherry picked from commit 737e085a81)
 2015-06-23 12:16:07 +02:00
Alejandro Gallardo Escobar 4f9f8d2449 Fixed the title of the locked button dialog 2015-06-23 12:07:18 +02:00
artica 277223def5 Auto-updated build strings. 2015-06-23 00:01:14 +02:00
Alejandro Gallardo Escobar aea50e915a Fix to the date insertion when processing schema files 2015-06-22 19:19:59 +02:00
Alejandro Gallardo Escobar 4a4aaa4e3f Added support to exporting the area graph data to CSV 2015-06-22 19:12:17 +02:00
mdtrooper b9b24ce873 Cleaned source code style. 2015-06-22 17:37:31 +02:00
mdtrooper df9b99ce16 Fixed the empty table in the html_print_table function. 
(cherry picked from commit be65df793b)
 2015-06-22 17:36:28 +02:00
mdtrooper be65df793b Fixed the empty table in the html_print_table function. 2015-06-22 17:35:47 +02:00
mdtrooper afecb459c5 Working in the enterprise feature dynamic reports. 2015-06-22 16:22:48 +02:00
mdtrooper 447c4ccd6d Some fixes in the code. 2015-06-22 16:10:15 +02:00
m-lopez-f 2754bfeeb0 Fixed inserts paths in DB. Tiquet: #2325 2015-06-22 10:30:57 +02:00
artica 06c10bcc6a Auto-updated build strings. 2015-06-22 00:01:11 +02:00
artica 71283133f6 Auto-updated build strings. 2015-06-21 00:01:09 +02:00
artica f62058639a Auto-updated build strings. 2015-06-20 00:01:12 +02:00
m-lopez-f 2c286b4f59 Fixed problems with titles in images and links 
(cherry picked from commit b8b4c2d440)
 2015-06-19 14:46:02 +02:00
Alejandro Gallardo Escobar 9644a91b67 Fixed an error in the order of the parameters of a function 2015-06-19 12:11:11 +02:00
Alejandro Gallardo Escobar 02791bc7c8 Fixed some errors 2015-06-19 11:40:04 +02:00
artica daa3c44a0d Auto-updated build strings. 2015-06-19 00:01:15 +02:00
Alejandro Gallardo Escobar 3b037caf32 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-06-18 20:02:01 +02:00
Alejandro Gallardo Escobar 390db6c06c Lot of fixes for oracle databases 2015-06-18 19:17:59 +02:00
artica 3eabe512b4 Auto-updated build strings. 2015-06-18 00:01:10 +02:00
mdtrooper d8e9a2406d Some fixes in the visual console. 2015-06-17 19:14:25 +02:00
mdtrooper 062817ca09 Some fixes in the visual console. 2015-06-17 17:37:23 +02:00
mdtrooper f1185c6db9 Some fixes in the visual console. 2015-06-17 17:36:41 +02:00
mdtrooper b2e31d9ca2 Some fixes in the visual console. 2015-06-17 17:04:14 +02:00
mdtrooper 6faa522187 Some fixes in the visual console. 2015-06-17 17:03:05 +02:00
mdtrooper bf0e89be3a Some fixes in the visual console. 2015-06-17 16:45:21 +02:00
mdtrooper ab032aa17a Some fixes in the visual console. 2015-06-17 15:55:16 +02:00
mdtrooper 43e8edc049 Some fixes in the visual console. 2015-06-17 12:42:52 +02:00
mdtrooper b7c6998fda Some fixes in the visual console. 2015-06-17 12:18:52 +02:00
m-lopez-f f338315bad Fixed wmi query, selected wrong column. Tiquet: #2309 2015-06-17 11:44:38 +02:00
m-lopez-f d4f628537e change wmi query. Tiquet: #2309 2015-06-17 09:06:10 +02:00
artica 4fff8ffe88 Auto-updated build strings. 2015-06-17 00:01:21 +02:00
mdtrooper dac4d30e91 Some fixes in the javascript visualmap. 2015-06-16 18:45:42 +02:00
mdtrooper ff1a35cb92 Some fixes in the javascript visualmap. 2015-06-16 18:02:58 +02:00
Alejandro Gallardo Escobar 3e2391a7c3 Fixed the alert info retrieving for oracle databases 2015-06-16 17:54:20 +02:00
Alejandro Gallardo Escobar 1905c8a038 Visual fixes into the alerts list 2015-06-16 17:54:19 +02:00
mdtrooper 5e026a03e1 Some fixes. 2015-06-16 17:44:15 +02:00
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
Alejandro Gallardo Escobar e5685dfe07 Fixed errors for oracle databases 2015-06-16 15:39:27 +02:00
Alejandro Gallardo Escobar c437797ef7 Fixes for oracle 2015-06-16 15:07:33 +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
mdtrooper a71ab9b19a Fixed the field type of server_name in table treport_content (CLOB to VARCHAR2(1000)) 2015-06-15 16:44:31 +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
Junichi Satoh e638680b03 Fixed sql error. 2015-06-14 11:50:31 +09:00
Junichi Satoh a75a7370cf Added graphviz binary path adjustment for FreeBSD. 2015-06-14 10:02:43 +09: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 05f27a4bdc Fixed an error retrieving data with oracle 2015-06-12 14:25:43 +01: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 9ad8b1035c Tiny feature, the slide form to config chart in the module chart window adapt to the height of window. 2015-06-11 20:19:50 +02:00
mdtrooper 37a7cf6cf2 Some fixes in the code. 2015-06-11 20:17:54 +02:00
mdtrooper a364542454 Sort and structure the code and result form with a huge fields of visual pandora setup. 2015-06-11 19:08:57 +02:00
Alejandro Gallardo Escobar 35623b06bf Improved the oracle compatibility 2015-06-11 18:39:33 +02:00
Alejandro Gallardo Escobar 5963f47432 Removed some jQuery.ajax() timeouts 2015-06-11 18:39:02 +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 e2281d6bc8 Debug trace removed 2015-06-11 12:07:27 +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 bcfd0237bb Improvements on the oracle compatibitily 2015-06-10 17:44:20 +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
mdtrooper f9b6290413 Fixed the list of items in the report editor. 2015-06-10 15:14:48 +02:00
artica 28f10174d4 Auto-updated build strings. 2015-06-10 00:01:12 +02:00
Alejandro Gallardo Escobar c8806ef1dc Fixes to improve the oracle compatibility 2015-06-09 18:52:11 +02:00
mdtrooper 458d9909d4 Now in the function 'filemanager_read_recursive_dir' returns the directories 
(cherry picked from commit ae97ad964d)

Conflicts:
	pandora_console/include/functions_filemanager.php
 2015-06-09 15:55:59 +02:00
Alejandro Gallardo Escobar 7864e993d4 Error fixes 2015-06-09 12:43:12 +02:00
mdtrooper 0eafdac3ff Fixed the javascript to check a numeric field when it is empty. TICKET: #2176 
(cherry picked from commit 905d768322)
 2015-06-09 11:49:03 +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 e326c8ff20) 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 16c2e10a4f)
 2015-06-03 17:21:16 +02:00
mdtrooper a9675820b9 Fixes for the Oracl€. 2015-06-03 17:00:28 +02:00
Alejandro Gallardo Escobar ce75ea467a Merge branch 'features/oracle' of https://github.com/pandorafms/pandorafms into features/oracle 2015-06-03 15:57:09 +02:00
Alejandro Gallardo Escobar 33129d89ce Instantiated an object (table) to avoid PHP warnings 2015-06-03 15:56:25 +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 f905ea1b16 Adapted the changes done by Rober Nelson in the commit e943bf0ada 2015-06-02 18:56:03 +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
Alejandro Gallardo Escobar ade22203c5 Added a new option to the db connection function 2015-06-02 18:03:39 +02:00
Alejandro Gallardo Escobar 6d47307ad2 Fixes for oracle 2015-06-02 18:03:39 +02:00
Alejandro Gallardo Escobar 127f53e8c8 Added the new function "set_when_empty" 2015-06-02 18:03:39 +02:00
artica bdda81b436 Auto-updated build strings. 2015-06-02 00:01:10 +02:00