Merge branch 'issueThirtyNine' into 'develop' (bc7a9916) · Commits · Joshua Gill / ASE_Y2S1_CP_G4 · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

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

Snippets Groups Projects

bc7a9916

Commit bc7a9916 authored 3 years ago by Joshua Gill

Downloads
- Plain Diff

Merge branch 'issueThirtyNine' into 'develop'

# Conflicts:
#   src/main/resources/database/schema.sql

parents 31484c40 f2137334

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/com/example/clientproject/data/events/Events.java 27 additions, 0 deletions

...in/java/com/example/clientproject/data/events/Events.java
src/main/java/com/example/clientproject/data/events/EventsRepo.java 19 additions, 0 deletions

...ava/com/example/clientproject/data/events/EventsRepo.java
src/main/java/com/example/clientproject/data/logs/Logs.java 43 additions, 0 deletions

src/main/java/com/example/clientproject/data/logs/Logs.java
src/main/java/com/example/clientproject/data/logs/LogsRepo.java 43 additions, 0 deletions

...in/java/com/example/clientproject/data/logs/LogsRepo.java
src/main/java/com/example/clientproject/data/users/Users.java 5 additions, 0 deletions

...main/java/com/example/clientproject/data/users/Users.java
src/main/java/com/example/clientproject/service/LoggingService.java 65 additions, 0 deletions

...ava/com/example/clientproject/service/LoggingService.java
src/main/java/com/example/clientproject/service/Utils/JWTUtils.java 22 additions, 2 deletions

...ava/com/example/clientproject/service/Utils/JWTUtils.java
src/main/resources/database/WeekFourERD.png 0 additions, 0 deletions

src/main/resources/database/WeekFourERD.png
src/main/resources/database/schema.sql 35 additions, 0 deletions

src/main/resources/database/schema.sql
src/test/resources/schema-test-h2.sql 48 additions, 1 deletion

src/test/resources/schema-test-h2.sql

with 307 additions and 3 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