Commit Graph

5241 Commits

Author SHA1 Message Date
crash890 620d8e01b8 Update update_manager.ajax.php
This would be to include proxy configuration in the download process. Without this Proxy will work to check for downloads, but the actual download does not respect the proxy settings.
2015-07-31 16:57:41 -04:00
pandora-release 7f4b43745c Updated version and build strings for the 6.0RC1 release. 2015-07-31 13:26:41 +02:00
m-lopez-f cd676cac59 change in the way data show snmp data timeticks. Tiquet: #2494 2015-07-31 11:16:42 +02:00
Arturo Gonzalez Diaz e8d5dfde06 Now the logout text in other lenguaje (not english) it show correctly. Ticket#2506 2015-07-31 09:20:17 +02:00
artica 4eeede3fc2 Auto-updated build strings. 2015-07-31 00:01:10 +02:00
m-lopez-f fd7fc4eb00 Fixed LDAP connection when name containt space and data login is false 2015-07-30 16:10:21 +02:00
artica 0d37ef20de Auto-updated build strings. 2015-07-30 00:01:11 +02:00
m-lopez-f 3d453ba3cc Update spanish translations 2015-07-29 11:50:17 +02:00
artica 44e064ca91 Auto-updated build strings. 2015-07-29 00:01:12 +02:00
m-lopez-f dfcfc85303 Add new funcionality of remote login with Active Directory 2015-07-28 16:10:45 +02:00
artica 6fa1e8e869 Auto-updated build strings. 2015-07-28 00:01:09 +02:00
mdtrooper c003bf344a Working in the center labels into the items in a visualmap. (not finished) 2015-07-27 16:24:04 +02:00
m-lopez-f 3e0b8a0f52 Fixed errors in php 2015-07-27 15:34:09 +02:00
artica ef4feb7006 Auto-updated build strings. 2015-07-27 00:01:09 +02:00
artica b9b630e84f Auto-updated build strings. 2015-07-26 00:01:09 +02:00
artica a890dfd3a0 Auto-updated build strings. 2015-07-25 00:01:11 +02:00
mdtrooper b1034c2071 Working in the features and improvements in dashboard. 2015-07-24 16:43:54 +02:00
mdtrooper c4fc8586fd First commit with the changes. 2015-07-24 14:32:26 +02:00
artica b572cf650c Auto-updated build strings. 2015-07-24 00:01:10 +02:00
artica 48215f3dfa Auto-updated build strings. 2015-07-23 00:01:13 +02:00
mdtrooper 247f14aef9 Fixed the report item SLA with some configurations. 2015-07-22 16:50:52 +02:00
m-lopez-f 0bbd4ba18f Fixed error to access when download mibs. Tiquet: #2523 2015-07-22 13:30:45 +02:00
m-lopez-f a316419afa Add new options when render proc is active. Tiquet: #2503 2015-07-22 11:49:00 +02:00
m-lopez-f da80a1ad82 Fixed creation hbar, not show all legend. Tiquet: #2498 2015-07-22 10:33:49 +02:00
artica b75940bfe8 Auto-updated build strings. 2015-07-22 00:01:40 +02:00
mdtrooper 9bc9e6f729 Fixed the availability item report. TICKET: #2423 2015-07-21 18:50:57 +02:00
m-lopez-f 3e7264a470 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-07-21 13:26:21 +02:00
m-lopez-f 6b6f18a695 When user hace acl's and tags dont see data in tree view, its fixed. Tiquet:#2508 2015-07-21 13:26:07 +02:00
mdtrooper a4b5f8607f Added feature. The report items SLA, Availaibily and General do not show the not init modules. TICKET: #2510 2015-07-21 13:10:44 +02:00
mdtrooper a8162a1876 Added function 'modules_is_not_init' 2015-07-21 13:06:22 +02:00
mdtrooper 1b766d9e3e Fixed PHP warnings. 2015-07-21 12:02:33 +02:00
m-lopez-f 0ef4510990 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-07-21 11:01:24 +02:00
m-lopez-f 7ecbd7cfed Fixed error when user hace strict_user and acl's permisions and tags. Tiquet: #2508 2015-07-21 11:01:01 +02:00
mdtrooper f1ada9076e Added a filter 'normal & critical' in severity into events. 2015-07-21 10:40:29 +02:00
m-lopez-f f2181d66d7 Fixed problems with visual console. Tiquets: #2465,#2483,#2482,#2486 2015-07-21 08:41:26 +02:00
artica 6113be2fde Auto-updated build strings. 2015-07-21 00:01:11 +02:00
artica 577e210556 Auto-updated build strings. 2015-07-20 00:01:09 +02:00
artica 4c53848244 Auto-updated build strings. 2015-07-19 00:01:09 +02:00
artica 362f9863cf Auto-updated build strings. 2015-07-18 00:01:12 +02:00
Alejandro Gallardo Escobar a90111ac18 Restored the call 'get_agent_modules_json_for_multiple_agents' and improved their performance 2015-07-17 10:02:11 +02:00
m-lopez-f 82354079ce Fixed heigth in pure view when view services map. Tiquet: #2470 2015-07-17 09:49:44 +02:00
artica cde2fb5a7b Auto-updated build strings. 2015-07-17 00:01:39 +02:00
Alejandro Gallardo Escobar df27567592 Fixed an error in the function 'planned_downtimes_stop'
(cherry picked from commit f01c021b14)
2015-07-16 15:51:53 +02:00
mdtrooper 75873b02d4 Some fixes in the visualmap. 2015-07-16 15:12:47 +02:00
Alejandro Gallardo Escobar f14b07014f Merge pull request #34 from pandorafms/feature/ticket#2404-planned-downtimes-acl
Ended, tested and aproved
2015-07-16 13:48:41 +01:00
Alejandro Gallardo Escobar 4d43033d46 Fixed some general and ACL errors and improved some pieces of code
Downtime editor.
Some of the ACL checks added are:
-Permission check on downtime before adding an agent
-Permission check on agent before adding an agent
-Permission check on downtime before deleting an agent
-Permission check on agent before deleting an agent
-Permission check on downtime before creating or updating the downtime
-Removed the ACL check for every result item (it is done before, into the query)
-Permission check on the query for the agents added to the downtime

Downtime editor ajax.
Some of the ACL checks added are:
-Permission check on downtime before retrieving the modules
-Permission check on agent before retrieving the modules
-Permission check on downtime before deleting the modules
-Permission check on agent before deleting the modules
-Permission check on downtime before adding the modules
-Permission check on agent before adding the modules
2015-07-16 13:53:57 +02:00
Alejandro Gallardo Escobar cbd4b60aca Fixed an error in the function 'extract_column' 2015-07-16 13:27:11 +02:00
mdtrooper 85b47df1fe Fixed the xml reports with & in the values. 2015-07-16 11:48:17 +02:00
artica f94c6668e0 Auto-updated build strings. 2015-07-16 00:01:15 +02:00
Alejandro Gallardo Escobar e8d68739b7 Added a function to stop a planned downtime (once type) and recover the agent and modules status 2015-07-15 18:41:58 +02:00
Alejandro Gallardo Escobar 05f40a21fc Now the data column of the module's raw data dialog are casted to double when is numeric 2015-07-15 16:55:08 +02:00
Alejandro Gallardo Escobar a85edf061e Fixed the format of the decimal and the thousands marker for the numeric fields 2015-07-15 16:53:51 +02:00
Alejandro Gallardo Escobar ff5e786a5f Fixed some count functions and improvments on other functions 2015-07-15 16:08:20 +02:00
artica cd5beffee5 Auto-updated build strings. 2015-07-15 00:01:16 +02:00
m-lopez-f c4d6c18b25 Fixed styles and errors of php 2015-07-14 15:59:39 +02:00
mdtrooper adf6c263ea Added support for arrays into the function 'agents_get_addresses' 2015-07-14 12:49:36 +02:00
Alejandro Gallardo Escobar a097aabf80 Replaced the use of the jQuery 'attr' function with the 'prop' function when using the 'selected' property.
The 'attr' function is going to be deprecated an may cause errors in Firefox.
2015-07-14 11:11:22 +02:00
Alejandro Gallardo Escobar b0f894437e Minor fix 2015-07-14 10:20:04 +02:00
artica 7909ba2963 Auto-updated build strings. 2015-07-14 00:01:12 +02:00
Alejandro Gallardo Escobar 4f2c35ac63 Added the 'required' attribute to the input text and input text password through a function parameter 2015-07-13 12:45:35 +02:00
Akihiro Uchida eef7cd9df6 Prune menu sections disabled by enterprise_acl 2015-07-13 13:51:45 +09:00
artica 25c03bae2f Auto-updated build strings. 2015-07-13 00:01:09 +02:00
artica f666daca40 Auto-updated build strings. 2015-07-12 00:01:12 +02:00
artica 594870f0e9 Auto-updated build strings. 2015-07-11 00:01:17 +02:00
Alejandro Gallardo Escobar 13a5b8aba2 Error fixes 2015-07-10 15:20:28 +02:00
Alejandro Gallardo Escobar 398185bc8e Simplified the code 2015-07-10 15:11:34 +02:00
mdtrooper f3d6513c65 Added useful function 'is_metaconsole' in functions.php 2015-07-10 15:00:12 +02:00
Akihiro Uchida 9fbe18a5d4 Disable modification of executed planned downtime 2015-07-10 11:02:21 +09:00
artica f18ff9ea12 Auto-updated build strings. 2015-07-10 00:01:20 +02:00
m-lopez-f c4628c67a1 Merge branch 'develop' into feature/NewView 2015-07-09 17:53:26 +02:00
m-lopez-f 8c64e6b481 Fixed style 2015-07-09 17:52:37 +02:00
m-lopez-f 6826a1e56e Merge branch 'develop' into feature/NewView 2015-07-09 17:49:16 +02:00
Alejandro Gallardo Escobar c69b978af2 Added a required file to fix an error 2015-07-09 15:31:15 +02:00
Vanessa Gil a5b5307227 Updated translations. 2015-07-09 11:29:48 +02:00
artica 01c05f77f3 Auto-updated build strings. 2015-07-09 00:01:21 +02:00
mdtrooper f02abea556 Upload more files from previous commit. 2015-07-08 16:47:00 +02:00
mdtrooper 3d46327f55 Rewrote the ajax call 'get_agent_modules_json_for_multiple_agents' for to run with the agents cache in new metaconsole in 6 version. 2015-07-08 16:40:12 +02:00
m-lopez-f 606e29684b Add pagination in custom reports and visual console. Tiquet: #2398 2015-07-08 16:09:00 +02:00
m-lopez-f 869069476f Fixed error with array colors in histogram. Tiquet: #2402 2015-07-08 09:15:56 +02:00
artica 8b6d8e1cd2 Auto-updated build strings. 2015-07-08 00:01:15 +02:00
Alejandro Gallardo Escobar e80183baf1 Error fix 2015-07-07 16:47:03 +02:00
m-lopez-f f6e9cf37b0 Fixed error styles 2015-07-07 16:05:23 +02:00
Alejandro Gallardo Escobar a57e6b4a59 Minor improvements 2015-07-07 15:59:05 +02:00
artica aaea9ef42d Auto-updated build strings. 2015-07-07 00:01:18 +02:00
Alejandro Gallardo Escobar 89fe54d28a Error fixes 2015-07-06 18:26:44 +02:00
mdtrooper 3e2fd15302 Fixed, now the first task for visualmap does not show in metaconsole. 2015-07-06 18:18:52 +02:00
m-lopez-f 6b5df1983b Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-07-06 17:11:11 +02:00
m-lopez-f d053f5515a Fixed styles in metaconsole 2015-07-06 17:10:51 +02:00
Alejandro Gallardo Escobar 21cd55e54b Improved the windows compatibility of some routes 2015-07-06 12:34:31 +02:00
Alejandro Gallardo Escobar 35654709d1 Added a function to extract the column or columns of an array easily 2015-07-06 11:48:15 +02:00
artica 55b5bbcfa3 Auto-updated build strings. 2015-07-06 00:01:10 +02:00
artica 91ba095c90 Auto-updated build strings. 2015-07-05 00:01:10 +02:00
artica 8062934760 Auto-updated build strings. 2015-07-04 00:01:16 +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
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
Alejandro Gallardo Escobar 5b36f3aacf Fixed an error on the filter 2015-07-02 13:11:24 +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
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
Vanessa Gil 3d973710a3 Updated translations. 2015-06-30 17:00:35 +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 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 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
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 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
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 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 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
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
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 ae97ad964d)

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 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
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
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
m-lopez-f 988228a90a Fixed problems with snmpwalks, when server have mibs text in hexadeximal-string. Tiquet: #2288
(cherry picked from commit 127daf8fdc)
2015-06-01 15:24:53 +02:00
m-lopez-f 589f054928 Fixed error when selected in bulk actions agents edit any status, show all agents. Tiquet: #2261 2015-06-01 13:41:31 +02:00
mdtrooper 0df14010c9 Fixed the SLA item in the reports into metaconsole when some agents into this is disabled. 2015-06-01 12:47:39 +02:00
mdtrooper fd90f637df Fixed the availability item in the reports into metaconsole when some agents into this is disabled. 2015-06-01 12:09:44 +02:00
mdtrooper 1e71fc56bd Fixes for the Oracl€. 2015-06-01 11:15:54 +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
mdtrooper e4703a6f86 Fixed the function 'oracle_encapsule_fields_with_same_name_to_instructions'. 2015-05-29 16:48:14 +02:00
mdtrooper 4a36d18fe8 Fixed the error management in Oracl€. 2015-05-29 15:19:32 +02:00
mdtrooper 5c7b230e9b Merge some changes and fixed from the 'develop' branch. 2015-05-29 14:16:39 +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
Alejandro Gallardo Escobar 09998429b7 Modified the alert messages the system stores in the user session 2015-05-27 16:01:52 +02:00
artica eacb7300de Auto-updated build strings. 2015-05-27 00:01:14 +02:00
mdtrooper 1160fd800c Fixed the 'availability' item in report. (Merge from 5d25b7c8e6) 2015-05-26 17:20:34 +02:00
m-lopez-f 527d5079b3 Add option to changed image of service in visualconsole:builder. tiquet:#2175
(cherry picked from commit ca1641a4e0)
2015-05-26 16:01:57 +02:00
Alejandro Gallardo Escobar 5906f6dd44 Re-fixed the agents filter 2015-05-26 12:07:13 +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
m-lopez-f 8349b1da92 Update translations 2015-05-26 10:20:39 +02:00
m-lopez-f 45b22fe78a Changed text in notice of update console, tiquet: #2209 2015-05-26 09:41:31 +02:00
artica c0bc11e50a Auto-updated build strings. 2015-05-26 00:02:12 +02:00
Alejandro Gallardo Escobar 23b199d7cd Fixed the function 'events_create_event' for oracle databases 2015-05-25 19:53:20 +02:00
mdtrooper 991c406a70 Fixed the 'group_report' item in metaconsole reports. TICKET: #2249 2015-05-25 16:29:51 +02:00
mdtrooper 2f23441516 Fixed the 'inventory' and 'inventory_changes' items in metaconsole reports. TICKET: #2249 2015-05-25 16:01:33 +02:00
mdtrooper 22ce2d8902 Fixed the 'group_configuration' and 'agent_configuration' items in metaconsole reports. TICKET: #2249 2015-05-25 13:39:27 +02:00
mdtrooper e401dfa8bd Fixed the 'event_report_agent', 'event_report_group' and 'event_report_module' items in metaconsole reports. TICKET: #2249 2015-05-25 13:02:22 +02:00
m-lopez-f 2061130825 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-05-25 12:55:33 +02:00
m-lopez-f 86db63f4f9 Fixed problems with name of dynamic's worksmap. tiquet: #2207 2015-05-25 12:55:18 +02:00
mdtrooper d943fa5b78 Fixed the 'alert_report_agent', 'alert_report_group' and 'alert_report_module' item in metaconsole reports. TICKET: #2249 2015-05-25 12:46:32 +02:00
mdtrooper c713046edf Fixed the 'sql' item in metaconsole reports. TICKET: #2249 2015-05-25 11:19:25 +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
mdtrooper d2b094061a Fixed the 'monitor_report' item in metaconsole reports. TICKET: #2249 2015-05-22 18:02:41 +02:00
mdtrooper 29743cfa74 Fixed the 'projection_graph' item in metaconsole reports. TICKET: #2249 2015-05-22 17:55:06 +02:00
mdtrooper 10efebee28 Removed 'SLA_services' item in metaconsole reports. TICKET: #2249 2015-05-22 17:51:43 +02:00
mdtrooper cd62f8c91f Fixed the 'max_value', 'min_value', 'avg_value', 'sumatory', 'MTTR', 'MTBF', 'TTO', 'TTRT' items in metaconsole reports. TICKET: #2249 2015-05-22 17:43:27 +02:00
mdtrooper 9f48e5eaa1 Fixed the 'custom_graph' item in metaconsole reports. TICKET: #2249 2015-05-22 17:37:07 +02:00
mdtrooper 3ee4194d11 Fixed the 'simple_baseline_graph' item in metaconsole reports. TICKET: #2249 2015-05-22 17:25:56 +02:00
mdtrooper c004c2c1b6 Fixed the 'simple_graph' item in metaconsole reports. TICKET: #2249 2015-05-22 17:05:17 +02:00
mdtrooper 8107a78791 Added support to metaconsole in function 'events_get_group_events' 2015-05-22 17:04:23 +02:00
m-lopez-f a19e4cdbf5 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-05-22 14:33:56 +02:00
m-lopez-f 62ff5eaef4 Add new macro Events response, tiquet:#2253 2015-05-22 14:33:43 +02:00
mdtrooper f009758e93 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-05-22 12:31:49 +02:00
mdtrooper 2fe85510a7 Fixed PHP Warnings. 2015-05-22 12:31:33 +02:00
Alejandro Gallardo Escobar 6a533969ef Improved the element concatenation 2015-05-22 11:05:53 +02:00
artica 0ea32ce1dc Auto-updated build strings. 2015-05-22 00:01:13 +02:00
m-lopez-f 400cc3c587 If possible selected None own in owner event, tiquet: #2250 2015-05-21 15:23:37 +02:00
Alejandro Gallardo Escobar 33867fcc80 Fixed the function "events_get_count_events_validated" 2015-05-21 13:28:17 +02:00
mdtrooper 5eb372a7ff Moved the function 'reporting_get_stats_servers' to the correct file 2015-05-21 12:31:45 +02:00
mdtrooper 1cb3399425 Fixed PHP Warnings and PHP notices (The PHP version 5.3.4 (the PHP version in new CentOS) and uppers are very noisy.) 2015-05-21 12:18:40 +02:00
Alejandro Gallardo Escobar 5695611ba5 Added an order field to the group events query for oracle 2015-05-21 12:18:31 +02:00
Alejandro Gallardo Escobar b584f94b10 Successfully fixed and simplified the evil query of grouped events 2015-05-21 12:01:22 +02:00
artica bb934257e6 Auto-updated build strings. 2015-05-21 00:01:13 +02:00
Alejandro Gallardo Escobar 3176cdfaee Minor fixes 2015-05-20 17:37:39 +02:00
mdtrooper a0dbe00f92 Some fixes in the new code of report (html) 2015-05-20 13:11:41 +02:00
m-lopez-f 1d01bd6853 Fixed problems with value pure in visual console in meta,tiquet: #2202 2015-05-20 11:50:30 +02:00
artica 0dc669178b Auto-updated build strings. 2015-05-20 00:01:17 +02:00
Alejandro Gallardo Escobar 143243636c Error fixes related with the improved oracle compatibility 2015-05-19 19:21:05 +02:00
Alejandro Gallardo Escobar 837667b441 Removed the information about the defined alerts for the metaconsole (again) 2015-05-19 19:20:09 +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
mdtrooper f2683594b5 Fixes in the new code of reports. 2015-05-19 17:36:47 +02:00
Ramon Novoa c32c167b6e Ask for the old password before letting a user renew his password.
(cherry picked from commit 0840c20764)
2015-05-19 11:38:30 +02:00
artica 2896fb5324 Auto-updated build strings. 2015-05-19 00:01:15 +02:00
Alejandro Gallardo Escobar 7e67287ee0 Fixed errors related with the oracle compatibility 2015-05-18 19:06:21 +02:00
Alejandro Gallardo Escobar b8f2daf6fa Improved the functions that return a value 2015-05-18 19:05:22 +02:00
Alejandro Gallardo Escobar f7867e3ce0 Fixed errors related with the oracle compatibility 2015-05-18 18:33:31 +02:00
Alejandro Gallardo Escobar 24aa40a726 Fixed errors related with the oracle compatibility 2015-05-18 18:08:14 +02:00
Alejandro Gallardo Escobar c5d80cd104 Added history database support to the function '*_get_value_filter' 2015-05-18 18:05:09 +02:00
mdtrooper 0a9ae10a8f Merge branch 'develop' into feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES 2015-05-18 16:25:22 +02:00
mdtrooper 36467aaa5e Working in the refactoring the code of reports. Removed the xml code. 2015-05-18 14:49:02 +02:00
Ramon Novoa 2b698e5f35 Added a missing include.
(cherry picked from commit 641600c9ef)
2015-05-18 11:06:23 +02:00
mdtrooper 34b3557e9e Merge branch 'develop' into feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES 2015-05-18 10:46:27 +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 eb965ff7da Fixed the data retrieving with oracle databases 2015-05-14 17:57:59 +02:00
mdtrooper 4387c36bbf Some fixed for the enterprise PDF reports. 2015-05-14 17:26:49 +02:00
mdtrooper 98d9032034 Some fixed for the enterprise PDF reports. 2015-05-14 16:21:04 +02:00
mdtrooper 60d301944d Some fixed for the enterprise PDF reports. 2015-05-14 15:52:55 +02:00
mdtrooper fadeaef80a Some fixed for the enterprise PDF reports. 2015-05-14 13:17:59 +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
mdtrooper e005a352ab Some fixes for the enterprise PDF reports. 2015-05-13 13:55:54 +02:00
artica 7d8fe9508b Auto-updated build strings. 2015-05-13 00:01:15 +02:00
mdtrooper 9e75cce59f Some changes and fixed for the reports in PDF. 2015-05-12 18:18:48 +02:00
m-lopez-f 27013cb6e7 Fixed generate data and visual of visual console when user used wizard, tiquet: #2196 2015-05-12 16:46:42 +02:00
mdtrooper 7ce25e9627 Some changes and fixed for the reports in PDF. 2015-05-12 16:41:08 +02:00
m-lopez-f b6c49949e4 Revert "Fixed generate data and visual of visual console when user used wizard, tiquet: #2196"
Problems with funcionality of visualconsole

This reverts commit 43bd6e0109.
2015-05-12 12:09:07 +02:00
m-lopez-f 43bd6e0109 Fixed generate data and visual of visual console when user used wizard, tiquet: #2196 2015-05-12 11:08:43 +02:00
artica d771989313 Auto-updated build strings. 2015-05-12 00:01:12 +02:00
Alejandro Gallardo Escobar e3ccfb95fe Refactored to fix some errors and improve the scalability 2015-05-11 20:54:23 +02:00
Alejandro Gallardo Escobar f0fe255f48 Added functions to process sql scripts to add data to the pandora database 2015-05-11 14:17:08 +02:00
Alejandro Gallardo Escobar e47af5993f Minor fix 2015-05-11 14:16:44 +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
m-lopez-f 9921304417 Fixed problems withs path in windows, tiquets: #2153,#2114 2015-05-08 09:51:53 +02:00
artica 3973044aa1 Auto-updated build strings. 2015-05-08 00:01:13 +02:00
mdtrooper def5a597a2 Fixed the image for the 'simple_graph' in the enterprise pdf reports. 2015-05-07 17:05:50 +02:00
m-lopez-f a43bfd5d5a Delete order by Data column in main data agent. tiquet: #2060 2015-05-07 08:53:37 +02:00
artica 4b7047d9a8 Auto-updated build strings. 2015-05-07 00:01:14 +02:00
mdtrooper 0ec32cc826 Fixed the PHP Warnings about the re-start the session.
(cherry picked from commit 1a035873dc)
2015-05-06 18:43:10 +02:00
mdtrooper 1a035873dc Fixed the PHP Warnings about the re-start the session. 2015-05-06 18:42:42 +02:00
mdtrooper c46bdc5087 Fixed the lost value for the config max_file_size.
(cherry picked from commit d2e57f2ec8)
2015-05-06 18:29:20 +02:00
mdtrooper d2e57f2ec8 Fixed the lost value for the config max_file_size. 2015-05-06 18:28:46 +02:00
mdtrooper 73e0a74a1a Merge branch 'develop' into feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.item_editor.php
	pandora_console/include/functions_reporting.php
2015-05-06 17:02:40 +02:00
mdtrooper c7108cce46 Changes in the code for the report in the dashboard. 2015-05-06 16:31:10 +02:00
mdtrooper 94313bb249 Fixed the lost default parameter in the function. 2015-05-06 16:28:57 +02:00
mdtrooper 249e2e730d Working in the refactoring the code of reports (SLA_services). 2015-05-06 13:24:29 +02:00
m-lopez-f f5b26f69e6 Add unit to legend left in graph of interface information, tiquet: #2194
(cherry picked from commit 277eb655a1)
2015-05-06 13:04:45 +02:00
artica 6f308321d4 Auto-updated build strings. 2015-05-06 00:01:12 +02:00
mdtrooper c2fdcbb1d8 Working in the refactoring the code of reports (SLA_monthly). 2015-05-05 13:15:10 +02:00
artica 5dc2b6be17 Auto-updated build strings. 2015-05-05 00:01:14 +02:00
Alejandro Gallardo Escobar 65a425859e Error fixes 2015-05-04 21:18:38 +02:00
Alejandro Gallardo Escobar c02f3bacf4 Error fixes related with the improved oracle compatibility 2015-05-04 20:11:03 +02:00
Alejandro Gallardo Escobar 7ae97fa48b Added a new function to sort an associative array by key 2015-05-04 20:10:13 +02:00
Alejandro Gallardo Escobar c95f70dde7 Error fixes related with the improved oracle compatibility 2015-05-04 18:27:23 +02:00
Alejandro Gallardo Escobar a98be1cad9 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-05-04 17:28:42 +02:00
Alejandro Gallardo Escobar b78dbf1c0d Merge remote-tracking branch 'origin/develop' into features/oracle 2015-05-04 16:44:40 +02:00
m-lopez-f c2ce4fddf4 fixed distance to show box data to graph in agent view, tiquet: #2161 2015-05-04 16:34:25 +02:00
m-lopez-f 6b974efe19 Merge branch 'feature/NewView' into develop 2015-05-04 15:45:34 +02:00
m-lopez-f 0b59266a61 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-05-04 15:45:17 +02:00
m-lopez-f 6241ae13d6 Add new option, when is active data of modules type is proc, show ok or fail. Tiquet: #1996 2015-05-04 15:44:37 +02:00
Alejandro Gallardo Escobar 57a9d4615c Renamed a table due to the character limitation in oracle 2015-05-04 14:41:40 +02:00
Ramon Novoa cf6a26a0b5 Fixed a call to enterprise_include_once (was called before
ENTERPRISE_DIR was set).
2015-05-04 14:15:35 +02:00
Ramon Novoa f16ba3e1da Updated the alert-matches help files with documentation from the Wiki. 2015-05-04 10:55:59 +02:00
artica b9ace11dda Auto-updated build strings. 2015-05-04 00:01:09 +02:00
artica 8c2851cf7f Auto-updated build strings. 2015-05-03 00:01:08 +02:00
artica 88bb073bca Auto-updated build strings. 2015-05-02 00:01:10 +02:00
artica 2ef016b06e Auto-updated build strings. 2015-05-01 00:01:12 +02:00
Alejandro Gallardo Escobar 1121fbd8b7 Fixed problems related with the oracle compatibility 2015-04-30 20:11:07 +02:00
m-lopez-f 70bca63bd6 Fixed error when read file in windows, when path containt space, tiquet: #2166 and #2114 2015-04-30 13:44:16 +02:00
Alejandro Gallardo Escobar 64466e4557 Error fix 2015-04-30 12:46:43 +02:00
Alejandro Gallardo Escobar 3264c65ef8 Fixed some problems with oracle compatibility 2015-04-30 12:35:42 +02:00
artica 0ce49f40b4 Auto-updated build strings. 2015-04-30 00:01:15 +02:00
mdtrooper 3a74ee9f15 Working in the refactoring the code of reports (SLA). 2015-04-29 19:05:06 +02:00
mdtrooper 5c2b0c0549 Working in the refactoring the code of reports (top_n). 2015-04-29 16:14:39 +02:00
Alejandro Gallardo Escobar 4008b12add Error fixes related with the improved oracle compatibility 2015-04-29 15:31:46 +02:00
artica fd00915457 Auto-updated build strings. 2015-04-29 00:01:11 +02:00
m-lopez-f c50bbb7eea Change login and styles 2015-04-28 15:29:15 +02:00
Ramon Novoa 484a5c1c2c Added missing help files. 2015-04-28 14:59:57 +02:00
m-lopez-f e093853691 Merge branch 'develop' into feature/NewView 2015-04-28 11:37:27 +02:00
artica 3ee1cfacd9 Auto-updated build strings. 2015-04-28 00:01:15 +02:00
mdtrooper bc9918707a Working in the refactoring the code of reports (event_report_group) and added the filter by text. TICKET: #2066 2015-04-27 13:42:03 +02:00
m-lopez-f 90d6ea15cf Merge branch 'develop' into feature/NewView 2015-04-27 10:12:45 +02:00
artica 9ef920de5f Auto-updated build strings. 2015-04-27 00:01:09 +02:00
artica 5e6c70b9d0 Auto-updated build strings. 2015-04-26 00:01:08 +02:00
artica 576aed5356 Auto-updated build strings. 2015-04-25 00:01:14 +02:00
Alejandro Gallardo Escobar 33fac67ed9 Merge remote-tracking branch 'origin/develop' into feature/meta-agent-cache 2015-04-24 18:11:31 +02:00
Alejandro Gallardo Escobar b0f5724248 Removed the information about the defined alerts for the metaconsole 2015-04-24 18:10:50 +02:00
mdtrooper 55dc1a278e Working in the refactoring the code of reports (event_report_module). 2015-04-24 14:24:17 +02:00
m-lopez-f 63354c0188 Add new images to login and changed login 2015-04-24 13:45:13 +02:00
mdtrooper 24e0c6430b Working in the refactoring the code of reports (inventory_changes). 2015-04-24 13:07:50 +02:00
mdtrooper 78267bcda4 Working in the refactoring the code of reports (inventory). 2015-04-24 11:51:46 +02:00
artica 7dbf60d4ef Auto-updated build strings. 2015-04-24 00:01:13 +02:00
Alejandro Gallardo Escobar 1ae9ee0810 Added support to retrieve agents from the new table of the metaconsole 2015-04-23 21:14:24 +02:00
Alejandro Gallardo Escobar a4431d63a7 Improved the code maintenance and added support to retrieve agents from the new table of the metaconsole 2015-04-23 21:12:24 +02:00
m-lopez-f b2ef7bc304 Changed visual of any views 2015-04-23 17:52:16 +02:00
Alejandro Gallardo Escobar 8a348c2411 Merge remote-tracking branch 'origin/develop' into feature/meta-agent-cache 2015-04-23 15:02:27 +02:00
artica 13b7d4a414 Auto-updated build strings. 2015-04-23 00:01:12 +02:00
m-lopez-f 3d2adc315e Change siual of view in any view 2015-04-22 16:46:08 +02:00
mdtrooper 201e4dcd8a Working in the refactoring the code of reports (agent_module). 2015-04-22 16:32:24 +02:00
mdtrooper 38ae50eb90 Working in the refactoring the code of reports (exception). 2015-04-22 13:00:08 +02:00
m-lopez-f a7117fca61 Changed visual and changed images 2015-04-22 09:51:34 +02:00
m-lopez-f b39d21b034 Merge branch 'develop' into feature/NewView 2015-04-22 09:48:45 +02:00
artica 7812f2a965 Auto-updated build strings. 2015-04-22 00:01:28 +02:00
m-lopez-f 50282ad121 Change image in print warning and add new images and chenge images 2015-04-21 18:03:08 +02:00
mdtrooper 1a41cc4973 Working in the refactoring the code of reports (group_report). 2015-04-21 17:27:21 +02:00
m-lopez-f dc09a9a14e Change visual and add new images 2015-04-21 17:26:20 +02:00
m-lopez-f 05c47bcafe Merge branch 'develop' into feature/NewView 2015-04-21 17:13:58 +02:00
Alejandro Gallardo Escobar 311fd99811 Improvements on the performance for the metaconsole 2015-04-21 14:01:10 +02:00
Alejandro Gallardo Escobar 90d5d3cae3 Changed an ajax call from synchronous to asynchronous 2015-04-21 13:58:28 +02:00
mdtrooper 6b13110b5b Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-21 13:18:56 +02:00
Vanessa Gil 0bdf9c4404 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-21 10:48:48 +02:00
Vanessa Gil 291704ea66 Update translations. 2015-04-21 10:48:25 +02:00
m-lopez-f 896e6329c8 Fixed problems with title when open graph in tree view in meta and nodo, tiquet: #2077 2015-04-21 10:44:50 +02:00
artica d6e7abe8c6 Auto-updated build strings. 2015-04-21 00:01:16 +02:00
m-lopez-f f52caebda3 Fixed error to replace character in tree view to data dialog 2015-04-20 17:44:21 +02:00
mdtrooper cd0d2c68e5 Fixed the function mysql_db_get_all_rows_in_table for several fields to order as array
(cherry picked from commit 36c5349cf4)
2015-04-20 16:26:05 +02:00
m-lopez-f dbfc273de9 Fixed error javascript 2015-04-20 15:48:17 +02:00
m-lopez-f 32582e5017 add title in dialog in tree view and change image in header 2015-04-20 12:31:04 +02:00
m-lopez-f 28522a1918 Add new images 2015-04-20 10:42:27 +02:00
m-lopez-f ebe95af69e Add title when open visual data in treeview and status monitor, tiquet: #2077 2015-04-20 10:40:42 +02:00
artica 4e0e988508 Auto-updated build strings. 2015-04-20 00:01:10 +02:00
Junichi Satoh b4dbefaf66 Updated help. 2015-04-19 17:06:05 +09:00
Junichi Satoh ece9cdb4b3 Updated help. 2015-04-19 13:48:46 +09:00
artica 1f06f8ec92 Auto-updated build strings. 2015-04-19 00:01:10 +02:00
artica d7b6fb05b4 Auto-updated build strings. 2015-04-18 00:01:11 +02:00
mdtrooper 1993dae682 Working in the refactoring the code of reports (database_serialized). 2015-04-17 19:24:07 +02:00
Alejandro Gallardo Escobar 968c179c0c Merge branch 'develop' into feature/meta-agent-cache 2015-04-17 16:16:48 +02:00
Alejandro Gallardo Escobar 8826f0c80c Adapted the code to improve the performance of the tree view on the metaconsole with the 'tmetaconsole_agent' 2015-04-17 16:12:51 +02:00
m-lopez-f eb5180d582 Merge branch 'feature/NewView' into develop 2015-04-17 13:06:20 +02:00
artica 332c5b0af5 Auto-updated build strings. 2015-04-17 00:01:30 +02:00
mdtrooper 8182edb9fa Fixed the SLA with a period have a setted a time slots.
(MANUAL cherry picked from commit c5b5d60d4c)
2015-04-16 19:23:55 +02:00
mdtrooper ec39e664fa Fixed the SLA with a period have a setted a time slots.
(cherry picked from commit c5b5d60d4c)
2015-04-16 19:21:13 +02:00
m-lopez-f 44128e3570 Merge branch 'develop' into feature/NewView 2015-04-16 16:00:56 +02:00
mdtrooper 3dbd433285 Fixed the history data in boolean and string charts.
(cherry picked from commit f24919fe4b)
2015-04-16 15:38:59 +02:00
m-lopez-f 036538baa9 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-16 15:18:28 +02:00
m-lopez-f 0df919dcdd Fixed order data to click in show data module in tree view,tiquet: #2080 2015-04-16 15:18:11 +02:00
Alejandro Gallardo Escobar e0165a4ab3 Merge branch 'develop' into feature/meta-agent-cache 2015-04-16 14:23:34 +02:00
Alejandro Gallardo Escobar 190e105baa Merge branch 'develop' into feature/meta-agent-cache 2015-04-16 13:40:42 +02:00
Alejandro Gallardo Escobar 08dd1832ac Found and removed the async ajax calls (finally!). That was a very bad practice.
Also removed the alert, cause after closing it, the blur event was executed again, with another alert that repeated the process.
2015-04-16 13:29:23 +02:00
Ramon Novoa 4f94d5bb50 Do not displayed advanced filters if custom filters are disabled. Small
fixes.
2015-04-16 11:35:20 +02:00
m-lopez-f db3e276195 Fixed error when flash_chart is false, colors of pie bad drawn, tiquet: #2107 2015-04-16 10:50:43 +02:00
mdtrooper 713988d674 Working in the refactoring the code of reports (group_configuration). 2015-04-15 21:00:17 +02:00
mdtrooper 1d0bab4b64 Working in the refactoring the code of reports (network_interfaces_report). 2015-04-15 19:05:52 +02:00
m-lopez-f 42e81ccc5a Fixed style in menu and views and upload new images 2015-04-15 17:35:36 +02:00
Vanessa Gil 0899805c11 Update translations. 2015-04-15 15:34:54 +02:00
Alejandro Gallardo Escobar afada892fe Modified the 'group_get_data' and 'group_get_group_list' to retrieve the data from the metaconsole's new agent cache table 2015-04-15 15:29:07 +02:00
Vanessa Gil a1c3f2d100 Group filter changed. 2015-04-15 12:22:07 +02:00
m-lopez-f a77d962590 Modify styles in tactical view and tables is responsibe with window size 2015-04-15 11:28:07 +02:00
mdtrooper befd3bedbf Working in the refactoring the code of reports (alert_report_group). 2015-04-15 11:26:08 +02:00
m-lopez-f 25277eb550 Fixed menu smtp from agent detail and modify agent 2015-04-15 10:26:48 +02:00
m-lopez-f 2d9168ac8f Changed styles from views in nodo 2015-04-15 09:45:13 +02:00
m-lopez-f aab9628cbd Merge branch 'develop' into feature/NewView 2015-04-15 09:38:00 +02:00
artica df42c4715f Auto-updated build strings. 2015-04-15 00:01:11 +02:00
mdtrooper 906d6c5fe3 Working in the refactoring the code of reports (alert_report_agent). 2015-04-14 20:10:20 +02:00
mdtrooper a3f602d114 Working in the refactoring the code of reports (alert_report_module). 2015-04-14 19:13:31 +02:00
mdtrooper f0d30f1057 Moved some the functions to 'functions_reporting.php' 2015-04-14 17:13:12 +02:00
mdtrooper 2b665f8117 Working in the refactoring the code of reports (sql_graph_vbar, sql_graph_hbar, sql_graph_pie). 2015-04-14 17:04:18 +02:00
mdtrooper c24d8f22e7 Working in the refactoring the code of reports (monitor_report). 2015-04-14 16:21:44 +02:00
mdtrooper 6ee2ea02d4 Working in the refactoring the code of reports (netflow_area, netflow_pie, netflow_data, netflow_statistics, netflow_summary). 2015-04-14 12:58:26 +02:00
m-lopez-f 7cb8e9dd16 Changed visual to tree view 2015-04-14 10:12:13 +02:00
m-lopez-f b8dd9705f1 Fixed style when option of submenu is selected 2015-04-14 09:56:04 +02:00
m-lopez-f 50f15dc507 Fixed errors php in menu 2015-04-14 09:37:28 +02:00
m-lopez-f f3de8d5bc8 Changed visual of tactical view 2015-04-14 09:36:41 +02:00
artica 5533100ac4 Auto-updated build strings. 2015-04-14 00:01:14 +02:00
mdtrooper ab09716cd4 Working in the refactoring the code of reports (simple_baseline_graph). 2015-04-13 18:42:35 +02:00
mdtrooper e5332924b1 Working in the refactoring the code of reports (prediction_date). 2015-04-13 18:15:02 +02:00
mdtrooper b3ef779319 Working in the refactoring the code of reports (projection_graph). 2015-04-13 16:37:10 +02:00
m-lopez-f 85b00c080c Draw pie with filter results and changed label, tiquet: #2076 2015-04-13 15:50:49 +02:00
m-lopez-f 962e7c9583 Fixed color when menu is selected 2015-04-13 13:57:15 +02:00
m-lopez-f a34b16a938 Merge branch 'develop' into feature/NewView 2015-04-13 13:44:43 +02:00
m-lopez-f 8d8476118f reorganize menu and changed styles of menu 2015-04-13 13:44:29 +02:00
Alejandro Gallardo Escobar 8e733cf019 Merge branch 'develop' into feature/meta-agent-cache 2015-04-13 12:54:39 +02:00
m-lopez-f 9e0e996960 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-13 12:48:28 +02:00
m-lopez-f b533897415 Fixed problems with print pie, show more data that data in list event,Nodo and Meta, tiquet: #2076 2015-04-13 12:47:49 +02:00
Vanessa Gil 6ed03f09dd Merge branch 'feature/sessions' into develop 2015-04-13 11:28:08 +02:00
Vanessa Gil 8600863d22 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-13 11:27:55 +02:00
Vanessa Gil a7f748b7be Ticket #1354. 2015-04-13 11:27:23 +02:00
m-lopez-f 4158afde8c Merge branch 'develop' into feature/NewView 2015-04-13 09:09:04 +02:00
m-lopez-f eac0f87405 Fixed menu and add new option in events sub_menu 2015-04-13 09:07:52 +02:00
artica 4498d1f842 Auto-updated build strings. 2015-04-13 00:01:09 +02:00
artica a171f76ff2 Auto-updated build strings. 2015-04-12 00:01:09 +02:00
artica ec514cd27e Auto-updated build strings. 2015-04-11 00:01:12 +02:00
Alejandro Gallardo Escobar 7d7b6ef02f Updated the help info 2015-04-10 19:16:06 +02:00
Alejandro Gallardo Escobar ae080dc33b Merge branch 'feature/ticket#2047-New-acl-bits' into develop 2015-04-10 14:06:35 +02:00
Alejandro Gallardo Escobar 03f9f94e04 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-10 14:06:27 +02:00
m-lopez-f a02acad7c4 Change visual of menu and funcionality 2015-04-10 13:43:02 +02:00
m-lopez-f e29497c394 Changed style of Nodo 2015-04-10 09:43:44 +02:00
m-lopez-f 91556f8096 Add new funcionality to menu and fixed other problems 2015-04-10 09:29:33 +02:00
mdtrooper f84863540f Merge from the pandora_5.1 branch to feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES branch the new report items (availability and time overlaped in the simple graphs). 2015-04-10 00:58:24 +02:00
artica 7286bd012f Auto-updated build strings. 2015-04-10 00:01:10 +02:00
m-lopez-f 01149f214a Changed lateral menu, order options and eliminate options 2015-04-09 15:04:23 +02:00
Alejandro Gallardo Escobar d25c32b76d Added some lost columns to check the ACL permissions 2015-04-09 15:03:26 +02:00
m-lopez-f a6af8ab18d Merge branch 'develop' into feature/NewView 2015-04-09 14:47:06 +02:00
Alejandro Gallardo Escobar d28cd4c172 Changes on the functionality and the ACL checks. Great improvements on the ACL management 2015-04-09 14:00:37 +02:00
artica 9353bdcdcb Auto-updated build strings. 2015-04-09 00:01:11 +02:00
Alejandro Gallardo Escobar 57e8032b20 Added info about the new visual console and networkmap bits 2015-04-08 20:07:16 +02:00
artica da36f04a1a Auto-updated build strings. 2015-04-08 00:01:10 +02:00
Ramon Novoa cc1faf5eb9 Added a missing include. 2015-04-07 11:55:18 +02:00
m-lopez-f 878c676c76 Fixed hidden menu and preparated immovable menu 2015-04-07 09:50:46 +02:00
Alejandro Gallardo Escobar e61ecd3f73 Added the new 'tperfil' columns to the function "get_acl_column" 2015-04-06 16:54:24 +02:00
m-lopez-f d04575bec4 Changed visual of console 2015-04-06 15:30:53 +02:00
Ramon Novoa 45ff0d0b6a Merge branch 'develop' into feature/meta-agent-cache 2015-04-06 15:26:51 +02:00
Ramon Novoa 71def9a7fb Implemented an agent cache for the metaconsole. 2015-04-06 15:26:26 +02:00
Vanessa Gil f1593481eb Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-06 15:10:53 +02:00
Vanessa Gil 2635f5ec41 New strings to translate. 2015-04-06 15:10:13 +02:00
m-lopez-f 0e277ad1ef Add new image for tree view, not view in internet explorer
(cherry picked from commit b63f1cfe81)
2015-04-06 13:53:49 +02:00
m-lopez-f b63f1cfe81 Add new image for tree view, not view in internet explorer 2015-04-06 13:49:28 +02:00
m-lopez-f ff7fd3d8a7 Fixed menu and change visual 2015-04-06 12:44:35 +02:00
m-lopez-f da24887922 Merge branch 'develop' into feature/NewView 2015-04-06 12:33:26 +02:00
m-lopez-f 0ab523ca9a Add warning when 'Event Storm protection' is activated, tiquet: #2065 2015-04-06 12:18:14 +02:00
m-lopez-f 790c81a250 Add order in parent select in static graph in visual console, Tiquet: #2067 2015-04-06 10:25:03 +02:00
artica 3cd52be7e9 Auto-updated build strings. 2015-04-06 00:01:07 +02:00
m-lopez-f f8c481a3ee Change views and styles in Console 2015-04-01 13:47:45 +02:00
m-lopez-f 0213cd7405 Change views and styles in Console 2015-04-01 13:24:53 +02:00
m-lopez-f acfd2146dc Change views and styles in Console 2015-04-01 12:09:23 +02:00
Vanessa Gil fae014e570 Update translations. 2015-04-01 11:09:04 +02:00
m-lopez-f 0e29cc520e Change visual of node 2015-03-31 17:26:22 +02:00
m-lopez-f 6cec43c5fa Merge branch 'develop' into feature/NewView 2015-03-31 17:23:05 +02:00
m-lopez-f d7f6868217 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-03-31 17:03:36 +02:00
Alejandro Gallardo Escobar 72af6134a1 Improved a jquery selector 2015-03-31 18:10:13 +02:00
Alejandro Gallardo Escobar 722c95c470 Replaced the old tooltip for the jquery widget version in the networkmaps section 2015-03-31 17:30:53 +02:00
m-lopez-f 7e02141e3f Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-03-31 14:46:58 +02:00
m-lopez-f a756ef1ab5 Fixed filter by name module in tree view, Node and Meta. tiquet: 2056 2015-03-31 14:46:43 +02:00
Alejandro Gallardo Escobar c0bc9ad136 Added a padding to the graph to prevent the text cut 2015-03-31 14:11:17 +02:00
Alejandro Gallardo Escobar 973f0c3e2e Error fixes and improvements 2015-03-31 12:27:12 +02:00
m-lopez-f 92b1be06ab Change visual of Group View 2015-03-31 09:52:27 +02:00
m-lopez-f 62c940986b Change menu and actions in this menu. 2015-03-31 09:18:46 +02:00
m-lopez-f a9bf3490fb Merge branch 'develop' into feature/NewView 2015-03-31 09:13:51 +02:00
Alejandro Gallardo Escobar 91b7bf19a5 Added functions to help with the data assign to the variables 2015-03-30 17:28:12 +02:00
mdtrooper 62c7ac463d Working in the refactoring the code of reports (agent_configuration). 2015-03-30 17:07:57 +02:00
Alejandro Gallardo Escobar 9920fa9a3f Fixed a missing tooltip 2015-03-30 12:03:34 +02:00
mdtrooper aabec6784e Rever some changes from the previous merge. 2015-03-30 11:33:26 +02:00
mdtrooper f8e544b89e Merge branch 'develop' into feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES
Conflicts:
	pandora_console/include/functions_reporting.php
2015-03-30 11:09:13 +02:00
mdtrooper cc8305429e Manual (by hand) cherry pick from the commit 63d322244d 2015-03-30 10:52:58 +02:00
m-lopez-f ffd099c782 Changed for fixed visual of metaconsole 2015-03-30 10:17:35 +02:00
artica 1d21b164b8 Auto-updated build strings. 2015-03-29 00:01:09 +01:00
Alejandro Gallardo Escobar fd41fba3d8 Changed the behaviour of the network map tooltip info for the strict users 2015-03-27 14:32:31 +01:00
mdtrooper cf09a85cd2 Workin in the refactoring the code of reports, move some functions from functions_repoting_html.php to functions_reporting.php 2015-03-27 13:03:15 +01:00
mdtrooper 54916a8002 Working in the refactoring the code of reports (MTTR, MTBF, TTO). 2015-03-27 10:24:44 +01:00
artica c29c47dc09 Auto-updated build strings. 2015-03-27 00:01:12 +01:00
Alejandro Gallardo Escobar 3d84b80c52 Fixed an error on the function 'tags_get_user_module_and_tags' caused by a string=integer comparision 2015-03-26 22:28:18 +01:00
Alejandro Gallardo Escobar 12013f8263 Merge branch 'feature/ticket#2028-network-map' into develop 2015-03-26 21:22:51 +01:00
Alejandro Gallardo Escobar b99e777300 Fixed an error on the function"tags_get_all_user_agents" 2015-03-26 21:17:53 +01:00
mdtrooper 56f4f3dc52 Merge branch 'develop' into feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES 2015-03-26 19:47:52 +01:00
mdtrooper 99247f7286 Manual (by hand) cherry pick of commit c7fa8710ec 2015-03-26 19:39:11 +01:00
Alejandro Gallardo Escobar 63d322244d Added a new parameter to the modules retrieving by tag function 2015-03-26 19:34:56 +01:00
mdtrooper 6d07408af8 Manual (by hand) cherry pick of commit f450d95278 2015-03-26 19:29:43 +01:00
mdtrooper b72af65bd0 Fixed the ajax of get modules when the user have profiles with tags and without tags. 2015-03-26 18:44:16 +01:00
m-lopez-f 220ad47b3f Change menu and visual any views, tiquets: #1815,#1702 2015-03-26 13:12:48 +01:00
mdtrooper 1a6a5539c1 Working in the refactoring the code of reports (summatory). 2015-03-26 11:29:10 +01:00
artica 7acba25778 Auto-updated build strings. 2015-03-26 00:01:14 +01:00
Alejandro Gallardo Escobar f462e38a7f Now the data handling of the function 'events_page_details' id done connected to the node when necessary 2015-03-25 19:57:34 +01:00
Alejandro Gallardo Escobar 08d93c8b28 Now the 'avg_only' option is enabled by default for the metaconsole users 2015-03-25 19:20:48 +01:00
Alejandro Gallardo Escobar 3b06988082 Fixed an ACL error on the 'tags_check_acl' and 'tags_check_acl_events' functions 2015-03-25 19:19:20 +01:00
mdtrooper 4924556a21 Working in the refactoring the code of reports (fixed max_value, added min_value and avg_value). 2015-03-25 18:28:58 +01:00
mdtrooper 13e78e44eb Working in the refactoring the code of reports (max_value). 2015-03-25 18:14:05 +01:00
mdtrooper 958b9c8ce3 Working in the refactoring the code of reports (url). 2015-03-25 17:19:13 +01:00
mdtrooper bc791ad3be Working in the refactoring the code of reports (text). 2015-03-25 16:58:53 +01:00
mdtrooper 803c03956d Working in the refactoring the code of reports (custom_graph). 2015-03-25 16:44:39 +01:00
m-lopez-f 75d9d58c48 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-03-25 16:15:04 +01:00
m-lopez-f c7fa8710ec Changed histogram of events in tactical view to metaconsole, tiquet: #2029 2015-03-25 16:14:47 +01:00
mdtrooper d17fbbc3a9 Working in the refactoring the code of reports. 2015-03-25 15:30:36 +01:00
mdtrooper b49b67be4d Working in the refactoring the code of reports. 2015-03-25 15:25:21 +01:00
mdtrooper 9d18fd6910 Fixed lost variable. 2015-03-25 13:04:11 +01:00
Alejandro Gallardo Escobar b945ee8892 ACL improvements for the module graphs 2015-03-25 12:26:16 +01:00
Alejandro Gallardo Escobar de65702f9a Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-03-25 12:25:13 +01:00
m-lopez-f 00ae340c87 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-03-25 10:31:50 +01:00
m-lopez-f 97bfae819c Change message when search and no find data. Tiquet: #2039 2015-03-25 10:31:32 +01:00
Vanessa Gil ede2e3794a Merge branch 'feature/translations' into develop 2015-03-25 10:20:11 +01:00
Vanessa Gil 6987d75b41 Update translations. 2015-03-25 10:18:48 +01:00
m-lopez-f f450d95278 Change title to events in tactical view in metaconsole, tiquet: #2005 2015-03-25 09:26:04 +01:00
artica 9994e08d7a Auto-updated build strings. 2015-03-25 00:01:13 +01:00
Alejandro Gallardo Escobar b8282a5cb1 Added support to show the interface traffic graphs through the metaconsole and improved the ACL
(cherry picked from commit fa9db9010c)
2015-03-24 19:15:46 +01:00
Alejandro Gallardo Escobar 481addb514 ACL improvements 2015-03-24 19:10:09 +01:00
Alejandro Gallardo Escobar 9b1a57a89d Fixed an error on the check acl functions 2015-03-24 19:08:43 +01:00
mdtrooper 62c5d57ca6 Working in the refactoring code of reporting. Added some items in html 2015-03-24 18:03:08 +01:00
mdtrooper ceca482158 Working in the refactoring code of reporting. 2015-03-24 17:52:57 +01:00
mdtrooper a5eaeb3ec9 Working in this feature (refactoring code of reporting) 2015-03-24 15:06:10 +01:00
mdtrooper 34caeb13c2 Working in the new feature. 2015-03-24 11:47:39 +01:00
mdtrooper 0cadefa2f0 Fixed the previous merge with the 'develop' branch. 2015-03-24 11:36:40 +01:00
mdtrooper fdaa8865b2 Working in the code refactoring. 2015-03-24 11:01:19 +01:00
mdtrooper bd607c0e61 Merge branch 'develop' into feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES
Conflicts:
	pandora_console/include/functions_reporting.php
2015-03-24 10:50:13 +01:00
artica 9915e22a11 Auto-updated build strings. 2015-03-24 00:01:11 +01:00
Alejandro Gallardo Escobar 857d9e2e11 Fixed a PHP syntax error 2015-03-23 21:02:06 +01:00
Alejandro Gallardo Escobar e3c1acfcf4 Merge branch 'feature/ticket#1981-Direct-graphs' into develop 2015-03-23 20:58:41 +01:00
Alejandro Gallardo Escobar da8570d3b9 Added support to show the interface traffic graphs through the metaconsole and improved the ACL 2015-03-23 20:51:44 +01:00
mdtrooper 2a832e5758 Fixed the querys with the string '0'. 2015-03-23 19:18:08 +01:00
m-lopez-f 97c39b5e12 Fixed problems when save a variable in visual setup and save text. Tiquet: #2002 2015-03-23 16:14:17 +01:00
m-lopez-f 57d9c66b78 Fixed error php 2015-03-23 14:50:43 +01:00
m-lopez-f a22d3f5434 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-03-23 14:48:45 +01:00
m-lopez-f 581d5e9c5f Fixed list of data in report when user have strict_acl, tiquet: #2014 2015-03-23 14:48:27 +01:00
Alejandro Gallardo Escobar 7360171bd7 Adapted the functions to work with the metaconsole
(cherry picked from commit 567b5125bd)
2015-03-23 14:34:04 +01:00
mdtrooper 118b980f4e Fixed the view of list event filters with a user is setted strict_acl. #2017 2015-03-23 14:17:06 +01:00
m-lopez-f 5f32d18f06 Not show correct color in histogram, tiquet: #2008 2015-03-23 14:02:22 +01:00
m-lopez-f da659a1e84 Fixed problems with visual in metaconsole 2015-03-23 13:48:12 +01:00
m-lopez-f 03c961f239 Change Visual metaconsole, simplify criteria tiquet: 2010 (Fixed problems php) 2015-03-23 13:38:59 +01:00
m-lopez-f af2722ac51 Change Visual metaconsole, simplify criteria tiquet: 2010 (Fixed problems php) 2015-03-23 12:37:27 +01:00
m-lopez-f c8e48dcbe3 Change Visual metaconsole, simplify criteria tiquet: 2010 2015-03-23 12:25:02 +01:00
mdtrooper e7b79a0a8f Working in the new feature. 2015-03-23 11:08:58 +01:00
artica 683f8b500c Auto-updated build strings. 2015-03-23 00:01:10 +01:00
artica f9b652867a Auto-updated build strings. 2015-03-22 00:01:09 +01:00
artica 9a9102d0ea Auto-updated build strings. 2015-03-21 00:01:11 +01:00
mdtrooper 21e0d423dc Merge branch 'develop' into feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES 2015-03-20 15:59:34 +01:00
Vanessa Gil da3429bbce Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-03-20 13:19:11 +01:00
artica a4084db68d Auto-updated build strings. 2015-03-20 00:01:07 +01:00
artica b5eed86c42 Auto-updated build strings. 2015-03-19 00:01:10 +01:00
Vanessa Gil 819ee73a28 Fixed bug #2007 2015-03-18 18:07:14 +01:00
mdtrooper 10156ffa77 Working in the refactor the code of reports. 2015-03-18 13:51:14 +01:00
m-lopez-f c287a2064a Changed style to visualice data in 'Group view' tiquet: #1879 2015-03-18 13:11:30 +01:00
m-lopez-f 6c1b434565 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-03-18 11:46:49 +01:00
m-lopez-f 912462c71a Solvented visualization of group in few views, tiquet: #1946 2015-03-18 11:46:27 +01:00
mdtrooper 868d1d5b39 Cleaned source code style. 2015-03-18 10:58:31 +01:00