Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

B

backend
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

cd4e1ccd

Commit cd4e1ccd authored 1 year ago by Jens Christian Aanestad

Downloads
- Plain Diff

Merge branch 'master' into javadoc

# Conflicts:
#	src/main/java/no/ntnu/idi/stud/savingsapp/controller/goal/GoalController.java

parents 19f22391 a26ce3ad

No related branches found

No related tags found

1 merge request!87Documentation/javadoc

Pipeline #284116 passed 1 year ago

Stage: build_test

Changes 6
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/no/ntnu/idi/stud/savingsapp/controller/goal/GoalController.java 11 additions, 1 deletion

...u/idi/stud/savingsapp/controller/goal/GoalController.java
src/main/java/no/ntnu/idi/stud/savingsapp/dto/goal/ChallengeTemplateDTO.java 1 addition, 0 deletions

...nu/idi/stud/savingsapp/dto/goal/ChallengeTemplateDTO.java
src/main/java/no/ntnu/idi/stud/savingsapp/dto/user/UserDTO.java 2 additions, 2 deletions

...in/java/no/ntnu/idi/stud/savingsapp/dto/user/UserDTO.java
src/main/java/no/ntnu/idi/stud/savingsapp/model/goal/ChallengeTemplate.java 4 additions, 0 deletions

...tnu/idi/stud/savingsapp/model/goal/ChallengeTemplate.java
src/main/java/no/ntnu/idi/stud/savingsapp/service/ChallengeService.java 11 additions, 0 deletions

...no/ntnu/idi/stud/savingsapp/service/ChallengeService.java
src/main/java/no/ntnu/idi/stud/savingsapp/service/impl/ChallengeServiceImpl.java 73 additions, 3 deletions

...di/stud/savingsapp/service/impl/ChallengeServiceImpl.java

with 102 additions and 6 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment