Resolve "Create new Model FeedbackLine and integrate it"
Closes #67 (closed)
Merge request reports
Activity
This branch needs to get an update from master since it got pretty old. Either merge master into this branch (would result in a rather ugly merge commit I guess) or delete and delete and reopen the branch but apply its commits onto the latest master (would prevent the merge commit).
Especially the pipelines used in this branch are too old and cannot be merged into master since master would probably fail.
A rebase is also an option since only one person has commits on the branch. But consider this when rebasing.
Edited by Jan Maximilian Michal- Resolved by Alexander Wähling
- Resolved by Alexander Wähling
- Resolved by Alexander Wähling
added 83 commits
-
1a87ae4f...07a12540 - 71 commits from branch
master
- 653dced8 - updated .gitignore, so .vscode is not tracked
- 2a6943f4 - added FeedBackLine-Model
- 9543fab6 - minor changes
- 2a846f22 - added some more
- 4bb3ee1a - finished Model and Serializer of Feedbackline
- 580e1168 - forgot to migrate properly
- 291d1e42 - started writing view
- c4c142bf - changed basic structure to between-object
- bff86874 - minor flake-changes
- a8044725 - merged with master
- c31c6065 - added serializers and views for Feedbacks-Models
- c2baf28e - resolved conflicts
Toggle commit list-
1a87ae4f...07a12540 - 71 commits from branch
- Resolved by Jan Maximilian Michal
- Resolved by Jan Maximilian Michal
- Resolved by Jan Maximilian Michal
- Resolved by Jan Maximilian Michal
added 1 commit
- a3b6d86a - Working version of Feedback Serializer incl. create
Please register or sign in to reply