Commits · issueThirtySeven · Joshua Gill / ASE_Y2S1_CP_G4

Dec 11, 2021
- Added new default error page · 75344605
  Seb Barnard authored 3 years ago
  
  75344605
- Merge branch 'develop' into 'issueThirtySeven' · 77320dcf
  Seb Barnard authored 3 years ago
```
fixed superadmin issue

See merge request !111
```
  77320dcf
- Merge branch 'develop' of https://git.cardiff.ac.uk/c2038058/ase_y2s1_cp_g4 into develop · 8966d90b
  John Watkins authored 3 years ago
  
  8966d90b
- Fixed some nav css · 277b70a2
  John Watkins authored 3 years ago
  
  277b70a2
- Merge remote-tracking branch 'origin/develop' into develop · 00c859d8
  Ethan Allen-Harris authored 3 years ago
  
  00c859d8
- fixed superadmin issue · 9c7ad122
  Ethan Allen-Harris authored 3 years ago and Ethan Allen-Harris committed 3 years ago
```
Signed-off-by: c2064724 <allen-harrise@cardiff.ac.uk>
```
  9c7ad122
- Fixed key information updating, added loading + success messages · 564c9a7a
  Seb Barnard authored 3 years ago
  
  564c9a7a
- resolve · edbb1e44
  John Watkins authored 3 years ago
  
  edbb1e44
- finished test suite for dashboard · eb0f51f3
  John Watkins authored 3 years ago
  
  eb0f51f3
- Removed pycache · a2fbf26e
  Ethan Allen-Harris authored 3 years ago
  
  a2fbf26e
- Testing and small bugfixes · 9c0d6506
  Ethan Allen-Harris authored 3 years ago
  
  9c0d6506
- Fixed stampboard changes not being saved · e3f95a6a
  Seb Barnard authored 3 years ago
  
  e3f95a6a
- added start of dashboard testing suite · 9f0bd9f5
  John Watkins authored 3 years ago
  
  9f0bd9f5
- Merge remote-tracking branch 'origin/develop' into develop · 4dae3bc1
  Joshua Gill authored 3 years ago
  
  4dae3bc1
- README updated with launch instructions for the database and server, end of project ERD also added · b7874e08
  Joshua Gill authored 3 years ago
  
  b7874e08
- Merge branch 'issueThirtySeven' into 'develop' · 722b9cfc
  Seb Barnard authored 3 years ago
```
Created and implemented remove redundant files class, fixed some templating issues on settings page

See merge request !110
```
  722b9cfc
- Created and implemented remove redundant files class, fixed some templating issues on settings page · e9a31065
  Seb Barnard authored 3 years ago
  
  e9a31065
- Remove alert for the image name when a new one is uploaded through the "User Settings" page · 7394284d
  Joshua Gill authored 3 years ago
  
  7394284d
- fixed user perms and some styling · 8476b5b8
  John Watkins authored 3 years ago
  
  8476b5b8
- Merge remote-tracking branch 'origin/develop' into develop · 8605936b
  Ethan Allen-Harris authored 3 years ago
  
  8605936b
- fixed styling issues · 65ef7639
  Ethan Allen-Harris authored 3 years ago and Ethan Allen-Harris committed 3 years ago
```
Signed-off-by: c2064724 <allen-harrise@cardiff.ac.uk>
```
  65ef7639
- fixed broken formatting on user settings · f845148a
  Ethan Allen-Harris authored 3 years ago
  
  f845148a
- Merge branch 'issueThirtySix' into 'develop' · a94ea14d
  Ethan Allen-Harris authored 3 years ago
```
mering super admin

See merge request !109
```
  a94ea14d
- Merge branch 'develop' into 'issueThirtySix' · fe63e6bc
  Ethan Allen-Harris authored 3 years ago
```
# Conflicts:
#   src/main/resources/database/schema.sql
```
  fe63e6bc
- converted routed to use base_url · 52fc43ff
  John Watkins authored 3 years ago
  
  52fc43ff
- Added start to selenium based front end full suite testing · c846124a
  John Watkins authored 3 years ago
  
  c846124a
Dec 10, 2021
- Logging fixed · 5c61bf49
  Joshua Gill authored 3 years ago
  
  5c61bf49
- test fixes 2 · 7079052d
  John Watkins authored 3 years ago
  
  7079052d
- test fixes · e41739c0
  John Watkins authored 3 years ago
  
  e41739c0
- Fixed heights of shops on dash · 480581ed
  John Watkins authored 3 years ago
  
  480581ed
- Merge branch 'issueThirtySix' into 'develop' · f651780b
  Ethan Allen-Harris authored 3 years ago
```
merge

See merge request !108
```
  f651780b
- Merge branch 'issueThirtyNine' into 'develop' · d0838fc3
  Joshua Gill authored 3 years ago
```
Issue complete

See merge request !107
```
  d0838fc3
- loginAPI logged · 3dd72dd1
  Joshua Gill authored 3 years ago
  
  3dd72dd1
- MiscQueriesImpl fully logged · 98a29b0d
  Joshua Gill authored 3 years ago
  
  98a29b0d
- Added text when you over filter on main search on dashboard · 9f349034
  John Watkins authored 3 years ago
  
  9f349034
- UserStampBoardService fully logged · 4e87faae
  Joshua Gill authored 3 years ago
  
  4e87faae
- added functional search bar · efc5566b
  Ethan Allen-Harris authored 3 years ago and Ethan Allen-Harris committed 3 years ago
```
Signed-off-by: c2064724 <allen-harrise@cardiff.ac.uk>
```
  efc5566b
- UserSocialSave fully logged · bbd5f372
  Joshua Gill authored 3 years ago
  
  bbd5f372
- fixed logout when not a superadmin · e7db6fbb
  John Watkins authored 3 years ago
  
  e7db6fbb
- UserFavouriteTagSaver fully logged · 11230f19
  Joshua Gill authored 3 years ago
  
  11230f19