17573 Commits

Author SHA1 Message Date
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
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
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 2b5d79b81cfef94e4575e875d5938461f84f53c0)
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
mdtrooper
87e60b80bc Fixed the call to io funcions in function 'config_update_value'.
(cherry picked from commit 4c91ec9063c05feaf17fc6691d168596e4b4ccc2)
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
89a4f63e89 Change text of label 2015-06-24 16:09:07 +02:00
artica
2569a46879 Auto-updated build strings. 2015-06-24 00:01:19 +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 be65df793b5ba0bdfb02a806210621468b88099b)
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 b8b4c2d4402ad477ec22c5cf1d68827cf2f7fd57)
2015-06-19 14:46:02 +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
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
Alejandro Gallardo Escobar
3e2391a7c3 Fixed the alert info retrieving for oracle databases 2015-06-16 17:54:20 +02:00
mdtrooper
5e026a03e1 Some fixes. 2015-06-16 17:44:15 +02:00