yaal/sisyphe
yaal/sisyphe
5
0
Fork 0
Code Issues 15 Pull requests 3 Projects Releases Packages Wiki Activity Actions

33-hour-balance #36

Open
sebastien wants to merge 2 commits from 33-hour-balance into main
pull from: 33-hour-balance
merge into: yaal:main
Conversation 0 Commits 2 Files changed 16 +187 -696
sebastien commented 2026-03-11 16:24:23 +01:00
Owner
Copy link

fixes #33

suppression de la page "résumé hebdo" et de toutes les fonctions rattachées

migration de suppression de la table user_weekly_targets

Ajout d'une nouvelle information sur la page de "Saisie hebdomadaire" : solde horaire

fixes https://forge.yaal.coop/yaal/sisyphe/issues/33 suppression de la page "résumé hebdo" et de toutes les fonctions rattachées migration de suppression de la table `user_weekly_targets` Ajout d'une nouvelle information sur la page de "Saisie hebdomadaire" : solde horaire
feat: display hour_balance on weekly time_entries page
Some checks failed
ci/woodpecker/push/lint Pipeline was successful
Details
ci/woodpecker/pr/lint Pipeline was successful
Details
ci/woodpecker/pr/tests Pipeline failed
Details
37431b71a1
Some checks failed
ci/woodpecker/push/lint Pipeline was successful
Details
ci/woodpecker/pr/lint Pipeline was successful
Details
ci/woodpecker/pr/tests Pipeline failed
Details
This pull request can be merged automatically.
This branch is out-of-date with the base branch
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 33-hour-balance:33-hour-balance
git switch 33-hour-balance

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff 33-hour-balance
git switch 33-hour-balance
git rebase main
git switch main
git merge --ff-only 33-hour-balance
git switch 33-hour-balance
git rebase main
git switch main
git merge --no-ff 33-hour-balance
git switch main
git merge --squash 33-hour-balance
git switch main
git merge --ff-only 33-hour-balance
git switch main
git merge 33-hour-balance
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
yaal/sisyphe!36
No description provided.