Merge remote-tracking branch 'origin/28-registration-feature' into 28-registration-feature (28f23846) · Commits · Haoyu Sun / Team5 Sports League application · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

T

Team5 Sports League application
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

28f23846

Commit 28f23846 authored 5 months ago by Xiemuqing Xiao

Downloads
- Patches
- Plain Diff

Merge remote-tracking branch 'origin/28-registration-feature' into 28-registration-feature

parent e4a68932

No related branches found

No related tags found

Loading

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/uk/ac/cf/spring/demo/sports/match/MatchItemController.java 61 additions, 0 deletions

...k/ac/cf/spring/demo/sports/match/MatchItemController.java
src/main/java/uk/ac/cf/spring/demo/sports/match/MatchItemRepository.java 26 additions, 0 deletions

...k/ac/cf/spring/demo/sports/match/MatchItemRepository.java
src/main/java/uk/ac/cf/spring/demo/sports/match/MatchItemService.java 26 additions, 0 deletions

...a/uk/ac/cf/spring/demo/sports/match/MatchItemService.java
src/main/java/uk/ac/cf/spring/demo/sports/security/SecurityConfig.java 49 additions, 14 deletions

.../uk/ac/cf/spring/demo/sports/security/SecurityConfig.java
src/main/resources/schema.sql 3 additions, 3 deletions

src/main/resources/schema.sql
src/main/resources/static/css/login.css 1 addition, 1 deletion

src/main/resources/static/css/login.css
src/main/resources/static/css/matchDetail.css 2 additions, 2 deletions

src/main/resources/static/css/matchDetail.css
src/main/resources/static/css/matchSchedule.css 6 additions, 1 deletion

src/main/resources/static/css/matchSchedule.css
src/main/resources/static/css/register.css 1 addition, 0 deletions

src/main/resources/static/css/register.css
src/main/resources/static/html/login.html 2 additions, 1 deletion

src/main/resources/static/html/login.html
src/main/resources/static/html/matchTable.html 10 additions, 0 deletions

src/main/resources/static/html/matchTable.html
src/main/resources/static/html/register.html 1 addition, 1 deletion

src/main/resources/static/html/register.html

with 188 additions and 23 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