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

Improved invoice preview #254

Merged
merged 23 commits into from
Sep 2, 2018
Merged

Improved invoice preview #254

merged 23 commits into from
Sep 2, 2018

Conversation

kevinpapst
Copy link
Member

@kevinpapst kevinpapst commented Aug 1, 2018

Fixes #262

  • Improved invoice preview
  • Added freelancer invoice

# Conflicts:
#	assets/css/app.scss
#	assets/js/app.js
#	config/packages/kimai.yaml
#	public/build/app.css
#	public/build/app.js
#	public/build/manifest.json
# Conflicts:
#	assets/css/app.scss
#	assets/css/invoice.scss
#	config/packages/kimai.yaml
#	public/build/app.css
#	public/build/app.js
#	public/build/manifest.json
@kevinpapst kevinpapst added this to the 0.5 milestone Sep 1, 2018
}

/**
* @Route("/invoice/freelancer", name="invoice_freelancer")
Copy link
Member Author

Choose a reason for hiding this comment

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

remove me

@kevinpapst kevinpapst merged commit a636faa into master Sep 2, 2018
@kevinpapst kevinpapst deleted the freelancer-invoice branch September 2, 2018 19:29
@lock
Copy link

lock bot commented Nov 18, 2018

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.

@lock lock bot locked and limited conversation to collaborators Nov 18, 2018
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.

1 participant