Closed mazzcris closed 7 years ago
Thanks, do you have a screenshot ?
Oh sorry, we have missunderstood us. I meant the other reset button. You will find it in the settings page. Please revert the changes for this button, because it is at a perfect position.
Ok no problem :) I will take a look to this as soon as I can
@blackus3r Something like this? (added a confirm popup, as the button could be clicked accidentally)
Nice, this is a good feature..
By the way, I have to merge your pull request in the right order. We have now conflicts...
I can fix my branch later in the evening
okay.
it seems, that you have not checked out new after finishing the text domains. But no problem.
@blackus3r I'm sorry, should be ok now
I have to merge this https://github.com/blackus3r/post-worktime-logger/pull/44 first. But there are conflicts in the settings.php file.
If everything is resolved, I can merge both pull requests.
@mazzcris Now we have here conflicts. Maybe the other pull requests has conflicts too.
@mazzcris can you please resolve the conflicts
Fixed conflicts: https://github.com/blackus3r/post-worktime-logger/pull/74
This should fix #43