Module: nagvis Branch: nagvis-1.5 Commit: 56a646e4aab1a4e6aa6c249db4463e2038ba5679 URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis;a=commit;h=56a646e4aab1a4e6aa6c249db4463e2038ba5679
Author: Lars Michelsen <[email protected]> Date: Wed Dec 29 22:17:33 2010 +0100 Merged changelog --- ChangeLog | 29 +---------------------------- 1 files changed, 1 insertions(+), 28 deletions(-) diff --git a/ChangeLog b/ChangeLog index 255a3fe..cc4dc54 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,18 +1,5 @@ 1.5.7 Core -<<<<<<< HEAD:ChangeLog -======= - * Added user/role profile config files located in nagvis/etc/profiles/(user|role).profile - The profile files can contain user/role specific options like languages and so on - * The language of a user is stored in the profile file now - * Added new options {file_group} and {file_mode} to global section of nagvis.ini.php. - These options are used whenever a file is written by NagVis - * Livestatus backend: Better error handling when writing to livestatus socket - * Lines can have three coords now to reposition the middle of lines having - two arrows - * Better handling for map config errors on overview page and map links - - no whole screen errors anymore ->>>>>>> 37b1be7... Additions to lines_weathermap_style; typos:ChangeLog * Refactored map configuration parsing code * Reimplemented maintenance mode: in_maintenance=1 is working again @@ -20,6 +7,7 @@ Automap * Hiding deprecated maxLayers param from automap modify dialog Frontend + * Bugfix: Multisite - Added state colors to multisite map listing (Thanks to BMuc) * Bugfix: Fixed showmaps,showautomaps,... option usage on overview page * Bugfix: Fixed search dialog access when using explicit permissions @@ -41,21 +29,6 @@ Backend: Livestatus available Frontend -<<<<<<< HEAD:ChangeLog -======= - * Added new sidebar for better navigation. It can be opened by clicking on - the "Open" label in the header menu. The state of the sidebar and the - single nodes is stored in user specific profile files - * Added new parameter {parent_map} to map/automap global sections which is - used in header/sidebar menus to draw a map hierarchy - * Colors and ranges of weathermap lines are now customizable using the - object configuration option line_weather_colors - * Fixed wrong label for MBit/s in weathermap bandwidth display - * It is now possible to lock/unlock objects in regular frontend (with the - necessary permissions) - * Lines can now be repositioned by dragging the ends using the anchors in unlocked mode - in regular frontend ->>>>>>> 37b1be7... Additions to lines_weathermap_style; typos:ChangeLog * Added password reset form to user management dialog * Bugfix: Acks/downtimes of problems were not recognized by background highlighting ------------------------------------------------------------------------------ Learn how Oracle Real Application Clusters (RAC) One Node allows customers to consolidate database storage, standardize their database environment, and, should the need arise, upgrade to a full multi-node Oracle RAC database without downtime or disruption http://p.sf.net/sfu/oracle-sfdevnl _______________________________________________ Nagvis-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
