Commit Graph

9623 Commits

Author SHA1 Message Date
m-lopez-f 05c47bcafe Merge branch 'develop' into feature/NewView 2015-04-21 17:13:58 +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
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
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 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
Vanessa Gil e93da42f5f Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-16 12:38:43 +02:00
Vanessa Gil a0750e2b96 Fixed bug loading ajax. 2015-04-16 12:37:42 +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
Ramon Novoa 79afef8cf8 Added support for metaconsole servers. 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
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
Vanessa Gil 7225b61530 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-15 13:14:33 +02:00
Vanessa Gil 802779c2b4 Change titles. 2015-04-15 13:14:03 +02:00
m-lopez-f 2813fac10b Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-15 12:40:05 +02:00
m-lopez-f 80144fe8bd Change in event save filter, name of label(META), tiquet: #2075 2015-04-15 12:39:50 +02:00
Vanessa Gil a1c3f2d100 Group filter changed. 2015-04-15 12:22:07 +02:00