Commit Graph

10339 Commits

Author SHA1 Message Date
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 2140d28ef5 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-06-22 19:16:01 +02:00
Alejandro Gallardo Escobar f438eac5d5 Error fixes 2015-06-22 19:15:32 +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