9881 Commits

Author SHA1 Message Date
mdtrooper
6b13110b5b Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-21 13:18:56 +02:00
mdtrooper
5572b88574 Fixed the lost checkbox to show graphs in the event items in the report 2015-04-21 13:18:29 +02:00
m-lopez-f
440ad8296f Change modules inventory and add new plugins 2015-04-21 11:42:45 +02:00
m-lopez-f
7645ec0b48 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-21 11:08:52 +02:00
m-lopez-f
26f33a5169 Fixed visual of metaconsole 2015-04-21 11:08:42 +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
m-lopez-f
6c26961534 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-21 09:06:15 +02:00
m-lopez-f
df065fb10d Fixed problems with title when open graph in status monitor in meta and nodo, tiquet: #2077 2015-04-21 09:06:05 +02:00
artica
d6e7abe8c6 Auto-updated build strings. 2015-04-21 00:01:16 +02:00
m-lopez-f
122f75054a Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-20 17:44:39 +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 36c5349cf46d75739aad15d62b29be7fe7cbdbe7)
2015-04-20 16:26:05 +02:00
Vanessa Gil
5f60c5d5cc Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-20 15:48:39 +02:00
m-lopez-f
dbfc273de9 Fixed error javascript 2015-04-20 15:48:17 +02:00
Vanessa Gil
f392f309d1 Added translation. 2015-04-20 15:48:06 +02:00
m-lopez-f
eb803c3ff2 Remove debug trace 2015-04-20 15:32:12 +02:00
m-lopez-f
f7d9831dd2 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-20 15:30:32 +02:00
m-lopez-f
a454a16c57 Fixed error when open graph in tree view and monitor view. tiquet: #2126 2015-04-20 15:30:16 +02:00
Ramon Novoa
878e65fa30 Fixed the XPATH query to retrieve log events. 2015-04-20 12:39:58 +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
m-lopez-f
744f082841 Delete order in field Data in monitor detail, tiquet: #2060 2015-04-20 08:44:06 +02:00
artica
4e0e988508 Auto-updated build strings. 2015-04-20 00:01:10 +02:00
Junichi Satoh
129e9d0dfa Added php json extension check. 2015-04-19 23:26:17 +09: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
Vanessa Gil
f34c10df09 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-17 14:55:31 +02:00
Vanessa Gil
1c3f0275b1 Ticket #1353. 2015-04-17 14:54:17 +02:00
m-lopez-f
eb5180d582 Merge branch 'feature/NewView' into develop 2015-04-17 13:06:20 +02:00
Ramon Novoa
250ef13bca Remove \n and \r from event descriptions. 2015-04-17 12:43:43 +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 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
Alejandro Gallardo Escobar
a70d751c38 Removed the text of the agent search.
The text 'All' makes no sense, cause the input searchs for it unnecessarily and the empty texts represents better the lack of filter.
2015-04-16 13:16:50 +02:00
Vanessa Gil
e93da42f5f Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-16 12:38:43 +02:00