Sulley
/
khana
2
2
Fork 0
Code Issues 33 Pull Requests 3 Releases Wiki Activity

[WIP] Review objectives #36

Draft
Fred wants to merge 2 commits from review/objectives into master
pull from: review/objectives
merge into: Sulley:master
Conversation 0 Commits 2 Files Changed 6 +121 -91
Fred commented 2020-10-27 21:48:17 +01:00
Owner
Copy Link

Topic de revues des objectifs, éducatifs, etc.

Cette merge request ne reprend pratiquement que des restructurations ou des blocs de commentaires en plus.

Le reste des remarques se trouve dans les tickets #37 #38 #39 #40 #41 #42 et #43.
Ou au niveau du milestone, si je n'ai rien oublié: https://sources.grimbox.be/Sulley/khana/milestone/1

Topic de revues des objectifs, éducatifs, etc. Cette merge request ne reprend pratiquement que des restructurations ou des blocs de commentaires en plus. Le reste des remarques se trouve dans les tickets #37 #38 #39 #40 #41 #42 et #43. Ou au niveau du milestone, si je n'ai rien oublié: https://sources.grimbox.be/Sulley/khana/milestone/1
Fred added this to the Revue de l'application `objective` milestone 2020-10-28 21:46:02 +01:00
This pull request has changes conflicting with the target branch.
  • src/objective/admin.py
  • src/objective/forms.py
  • src/objective/models.py
  • src/objective/views.py
You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.
git checkout -b review/objectives master
git pull origin review/objectives

Step 2:

Merge the changes and update on Gitea.
git checkout master
git merge --no-ff review/objectives
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
bug

Something is not working

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
help wanted

Need some help

  
invalid

Something is wrong

  
question

More information is needed

  
wontfix

This won't be fixed

No Label
bug
duplicate
enhancement
help wanted
invalid
question
wontfix
Milestone
Clear milestone
No items
No Milestone
Revue de l'application `objective`
Assignees
Clear assignees
No Assignees
1 Participants
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: Sulley/khana#36
No description provided.
Delete Branch "review/objectives"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?