This repository has been archived by the owner on May 13, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 20
Merge timed-backend #1089
Draft
trowik
wants to merge
1,594
commits into
adfinis:main
Choose a base branch
from
trowik:test-merge
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Merge timed-backend #1089
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fix(projects): add manager role to project assignees
This will allow to filter assignees by the given IDs, which will significally improve performance in the frontend.
feat: add `in` filter to assignees
fix(reports): use correct columns for calculations
change billing permission from reviewers to superuser and accountants
feat(employment): add is_accountant flag for user
fix: add X_FORWARDED_PROTO header
fix: fix black formatting
fix: use whitenoise middleware to host admin statics
total_hours was calculated for all reports during updated-range and not for total duration of the project
fix(redmine): fix total hours calculation
fix(reports): add logo and udpate font in workreport
rename permission to depict its functionality
fix(permissions): rename IsNotBilledAndVerified permissions
use projects billed flag on new reports set billed flag on updated reports according to project update all corresponding reports after setting the billed flag remove billed permission update factory-boy dependancy update snapshot
fix(tracking): set correct value for billed flag on reports use projects billed flag on new reports set billed flag on updated reports according to project update all corresponding reports after setting the billed flag remove billed permission update factory-boy dependency update snapshot
…urs-in-tasks feat(reports): change column for total hours for tasks
This will also add a command in Makefile which allows to start a dbshell.
fix(fixtures): add user with accountant role
This fixes the filtering of editable and non-editable reports for accountants.
feat: include user in ReportIntersection
This is especially the case with projects that are billed in advance.
fix(filters): billing should not affect finish state of a report
chore(docker): install wait-for-it from debian package
fix(redmine): log estimated_hours in update_project_expenditure command
chore: release v3.0.4
…ports Don't send emails when updating anything besides task on a rejected report that the user owns. Updating the task on a rejected report should still automatically unreject the report. Don't allow rejection of own reports.
fix(tracking): don't send emails when updating own rejected reports
newer versions of openpyxl use sets for cell ranges, which is not supported by pyxcel-xlsx (which uses openpyxl) version can be updated once the cell ranges use lists again or once pyexcel-xlsx adapts the use of sets for cell ranges https://foss.heptapod.net/openpyxl/openpyxl/-/commit/15957c567b9519104dac5da42ad03c261cd0106b https://foss.heptapod.net/openpyxl/openpyxl/-/commit/43039ea101675dbe3b81cd32b4f33112345ace5a
chore(deps): update django to 3.2.19
chore(release): v3.0.5
chore(redmine): add redmine issue id to log
chore(release): v3.0.6
Remove spent hours from update_project_expenditure bot as redmine report already does it.
refactor(redmine): remove spent hours from redmine bot
Decimal objects are not JSON serializable, therefore we have to convert them to float.
fix(redmine): convert Decimal objects to floats
chore: update dependencies and format code
This is part of merging timed-backend and timed-frontend into one repository.
This is part of merging timed-backend and timed-frontend into one repository.
- refactor dependabot - refactor test workflow - refactor release-npm.yml - refactor release-iamge.yml - move .gitignore - refactor .editorconfig - move LICENSE - refactor CODEOWNERS - refactor docker-compose - move Makefile - WIP: husky - refactor CONTRIBUTING - refactor README
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
TODO: complete description