17573 Commits

Author SHA1 Message Date
mdtrooper
8182edb9fa Fixed the SLA with a period have a setted a time slots.
(MANUAL cherry picked from commit c5b5d60d4ccdd93a06655cf0e4ee67bb634b2a2d)
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 c5b5d60d4ccdd93a06655cf0e4ee67bb634b2a2d)
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 f24919fe4b80b61e076f8b6589e77a2fe5a9416d)
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