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

Develop #291

Merged
merged 3 commits into from
Mar 25, 2021
Merged

Develop #291

merged 3 commits into from
Mar 25, 2021

Conversation

Christoph-Meyer
Copy link
Collaborator

@Christoph-Meyer Christoph-Meyer commented Mar 25, 2021

Hotfix for issue #290

aiakide and others added 3 commits March 24, 2021 13:37
* Clean up (#282)

* removed hardcoded URL

* Removed unnecessary endpoint

* Add illustrations for feature and hotfix branches to use in CONTRIBUTING.md

Image source: https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow. License checked

* Add branching section into to use in CONTRIBUTING.md

Describe the use of Gitflow in SonarQuest

Co-authored-by: Michael Landreh <[email protected]>
* Change input color of login input fields

* Add necessary fields into UserDto

* Fix Nullpointer Exceptions in world service

This occurs when a world should be found by an id that is null

* Change return type of 'getUser' and 'users' into UserDto

* Adjust getUser to be null safe
@Christoph-Meyer Christoph-Meyer merged commit 72434e2 into master Mar 25, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants