Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfixes for Kimai 1.4.1 #1158

Merged
merged 3 commits into from
Oct 7, 2019
Merged

Bugfixes for Kimai 1.4.1 #1158

merged 3 commits into from
Oct 7, 2019

Conversation

kevinpapst
Copy link
Member

@kevinpapst kevinpapst commented Oct 6, 2019

Description

Fixes #1157
Fixes tobybatch/kimai2#32

Types of changes

  • Bug fix (non-breaking change which fixes an issue)

Checklist

  • I verified that my code applies to the guidelines (composer kimai:code-check)
  • I updated the documentation (see here)
  • I agree that this code is used in Kimai and will be published under the MIT license

@kevinpapst kevinpapst added this to the 1.5 milestone Oct 6, 2019
@kevinpapst kevinpapst changed the title Kimai 1.4.1 Bugfixes for Kimai 1.4.1 Oct 6, 2019
@codecov
Copy link

codecov bot commented Oct 6, 2019

Codecov Report

Merging #1158 into master will decrease coverage by 0.03%.
The diff coverage is 68.75%.

@@             Coverage Diff              @@
##             master    #1158      +/-   ##
============================================
- Coverage     92.87%   92.83%   -0.04%     
- Complexity     3333     3344      +11     
============================================
  Files           332      332              
  Lines         10327    10342      +15     
============================================
+ Hits           9591     9601      +10     
- Misses          736      741       +5
Impacted Files Coverage Δ Complexity Δ
src/Controller/TeamController.php 89.85% <100%> (+0.14%) 23 <0> (ø) ⬇️
src/Utils/AvatarService.php 88.46% <100%> (+0.96%) 14 <2> (+2) ⬆️
src/Repository/TeamRepository.php 83.05% <55.55%> (-4.95%) 18 <8> (+8)
src/Controller/DoctorController.php 82.02% <66.66%> (-0.54%) 27 <0> (+1)

Copy link
Member

@tobybatch tobybatch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this will fix it but I'm also re-building the images to handle the free type extension

@kevinpapst
Copy link
Member Author

Awesome, then we will have a full feature set, thanks 👍

@kevinpapst kevinpapst merged commit ae6ed3f into master Oct 7, 2019
@kevinpapst kevinpapst deleted the kimai-1.4.1 branch October 7, 2019 14:04
@lock
Copy link

lock bot commented Dec 6, 2019

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs. If you use Kimai on a daily basis, please consider donating to support further development of Kimai.

@lock lock bot locked and limited conversation to collaborators Dec 6, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Fatal Error with docker-compose sample script Maybe: Conflict as Teamleader with missing user list
2 participants