Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

ASE_Y2S1_CP_G4
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

8966d90b

Commit 8966d90b authored 3 years ago by John Watkins

Downloads
- Plain Diff

Merge branch 'develop' of https://git.cardiff.ac.uk/c2038058/ase_y2s1_cp_g4 into develop

parents 277b70a2 00c859d8

No related branches found

No related tags found

2 merge requests!114LoggingService service class, new method to add a log to the "Logs" table when...,!111fixed superadmin issue

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

selenium testing/test.py 7 additions, 5 deletions

selenium testing/test.py
src/main/java/com/example/clientproject/web/controllers/AdminController.java 17 additions, 17 deletions

...xample/clientproject/web/controllers/AdminController.java
src/main/resources/database/Data Script/script.sql 1 addition, 2 deletions

src/main/resources/database/Data Script/script.sql

with 25 additions and 24 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