Merge branch 'fix-mail-url-pattern' into 'master' (32ffccb1) · Commits · ARSnova / ARSnova Backend · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

ARSnova Backend
- Activity
- Members
- Labels
- Releases
- Environments
- Incidents

Snippets Groups Projects

32ffccb1

Commit 32ffccb1 authored 5 years ago by

Daniel Gerhardt

Downloads
- Plain Diff

Merge branch 'fix-mail-url-pattern' into 'master'

Refactor account activation and password reset

Closes #47

See merge request !146

parents 4b212dd9 85424cfa

Branches

Pipeline #29819 passed with warnings with stages

in 2 minutes and 32 seconds

Changes 7
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/de/thm/arsnova/controller/AuthenticationController.java 6 additions, 4 deletions

...a/de/thm/arsnova/controller/AuthenticationController.java
src/main/java/de/thm/arsnova/controller/UserController.java 4 additions, 5 deletions

src/main/java/de/thm/arsnova/controller/UserController.java
src/main/java/de/thm/arsnova/controller/v2/AuthenticationController.java 5 additions, 8 deletions

...e/thm/arsnova/controller/v2/AuthenticationController.java
src/main/java/de/thm/arsnova/controller/v2/UserController.java 4 additions, 8 deletions

...ain/java/de/thm/arsnova/controller/v2/UserController.java
src/main/java/de/thm/arsnova/service/UserService.java 4 additions, 1 deletion

src/main/java/de/thm/arsnova/service/UserService.java
src/main/java/de/thm/arsnova/service/UserServiceImpl.java 27 additions, 24 deletions

src/main/java/de/thm/arsnova/service/UserServiceImpl.java
src/main/resources/config/defaults.yml 9 additions, 5 deletions

src/main/resources/config/defaults.yml

with 59 additions and 55 deletions

0% 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