Merge branch 'release-3.0.1'

xmera-circle · Jul 19, 2023 · 9a02264 · 9a02264
2 parents 54a8d17 + ff56d95
commit 9a02264
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 3.0.1 - 2023-07-19
+
+### Fixed
+
+* CSS styling for today line when user has holiday today
+
 ## 3.0.0 - 2023-07-18
 
 ### Added

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Workload Plugin for Redmine
 
-![Redmine Workload Version](https://img.shields.io/badge/Redmine_Plugin-v3.0.0-red) ![Redmine Version](https://img.shields.io/badge/Redmine-v5.0.z-blue) ![Language Support](https://img.shields.io/badge/Languages-en,_de,_fr,_es,_it-green) ![Version Stage](https://img.shields.io/badge/Stage-release-important) ![ci](https://github.com/xmera-circle/redmine_workload/actions/workflows/5-0-stable.yml/badge.svg)
+![Redmine Workload Version](https://img.shields.io/badge/Redmine_Plugin-v3.0.1-red) ![Redmine Version](https://img.shields.io/badge/Redmine-v5.0.z-blue) ![Language Support](https://img.shields.io/badge/Languages-en,_de,_fr,_es,_it-green) ![Version Stage](https://img.shields.io/badge/Stage-release-important) ![ci](https://github.com/xmera-circle/redmine_workload/actions/workflows/5-0-stable.yml/badge.svg)
 
 A complete rewrite of the original workload-plugin from Rafael Calleja.
 The plugin calculates how much work each user would have to do per day in order to hit the deadlines for all his issues.
@@ -13,7 +13,9 @@ Issues that have not filled in one of these fields will be shown in the overview
 
 ![Group Workload](screenshots/group-workload-example.png?raw=true "Group Workload Example")
 
-## New Features in Version 3.0.0 ( :warning: Possible Breaking Change for PostgreSQL user)
+## New Features in Version 3.0.0
+
+:warning: **[Possible Breaking Change for PostgreSQL user](#workday-settings)**
 
 ### API support for workload CSV export
 
@@ -78,6 +80,10 @@ The only way to have a look on the data was the workload page.
 There has been no way to transfer data, e.g. to excel, to draw some charts.
 Now there is a feature to export the workload per user and per role to build charts external.
 
+## Changelog
+
+See [CHANGELOG](/CHANGELOG.md) for a comprehensive overview of all changes.
+
 ## Installation / Uninstallation
 
 Please refer to [redmine.org -> Plugins](https://www.redmine.org/projects/redmine/wiki/Plugins)

diff --git a/assets/stylesheets/style.css b/assets/stylesheets/style.css
@@ -314,7 +314,7 @@ legend {
 
 .controller-workloads .data .holiday.today {
     background-color: var(--lightgray);
-    border-left: 2px solid red;
+    border-right: 2px dashed red;
     border-right: 1px solid var(--mediumgray);
 }
 

diff --git a/init.rb b/init.rb
@@ -9,7 +9,7 @@
   description 'This is a plugin for Redmine, originally developed by Rafael Calleja. It ' \
               'displays the estimated number of hours users and groups have to work to finish ' \
               'all their assigned issus on time.'
-  version '3.0.0'
+  version '3.0.1'
   url 'https://github.com/xmera-circle/redmine_workload'
 
   if RedmineWorkload.postgresql? && RUBY_VERSION <= '3.1'