Commits · develop · Joshua Gill / ASE_Y2S1_CP_G4 · GitLab

Snippets Groups Projects

Dec 12, 2021
- added superadmin selenium test · 0d4e2f0c
  Ethan Allen-Harris authored 3 years ago and Ethan Allen-Harris committed 3 years ago
```
Signed-off-by: c2064724 <allen-harrise@cardiff.ac.uk>
```
  0d4e2f0c
- added social media to vibezdrinks for presentation · 8f4ac46e
  Ethan Allen-Harris authored 3 years ago and Ethan Allen-Harris committed 3 years ago
```
Signed-off-by: c2064724 <allen-harrise@cardiff.ac.uk>
```
  8f4ac46e
- added banners and sample shops · 788d7369
  Ethan Allen-Harris authored 3 years ago and Ethan Allen-Harris committed 3 years ago
```
Signed-off-by: c2064724 <allen-harrise@cardiff.ac.uk>
```
  788d7369
- Fixed vibez drink link in creation script · c0838815
  Seb Barnard authored 3 years ago
  
  c0838815
- Removed line from JS of manage staff fragment · 4e293e76
  Seb Barnard authored 3 years ago
  
  4e293e76
Dec 11, 2021
- added more default pictures · 04009774
  Ethan Allen-Harris authored 3 years ago and Ethan Allen-Harris committed 3 years ago
```
Signed-off-by: c2064724 <allen-harrise@cardiff.ac.uk>
```
  04009774
- Merge remote-tracking branch 'origin/develop' into develop · 68bae8e3
  Joshua Gill authored 3 years ago
  
  68bae8e3
- Logging issues discovered are now fixed · aa88cd4a
  Joshua Gill authored 3 years ago
  
  aa88cd4a
- fixed small database issue · da65703e
  Ethan Allen-Harris authored 3 years ago and Ethan Allen-Harris committed 3 years ago
```
Signed-off-by: c2064724 <allen-harrise@cardiff.ac.uk>
```
  da65703e
- little more sample data · 04cb2de1
  Ethan Allen-Harris authored 3 years ago and Ethan Allen-Harris committed 3 years ago
```
Signed-off-by: c2064724 <allen-harrise@cardiff.ac.uk>
```
  04cb2de1
- Merge remote-tracking branch 'origin/develop' into develop · f8a70918
  Ethan Allen-Harris authored 3 years ago
  
  f8a70918
- little more sample data · 5800ec94
  Ethan Allen-Harris authored 3 years ago and Ethan Allen-Harris committed 3 years ago
```
Signed-off-by: c2064724 <allen-harrise@cardiff.ac.uk>
```
  5800ec94
- Merge remote-tracking branch 'origin/develop' into develop · 871075fb
  Joshua Gill authored 3 years ago
  
  871075fb
- Script updated to use actual default profile picture · 1ebb0906
  Joshua Gill authored 3 years ago
  
  1ebb0906
- Merge branch 'issueThirtySeven' into 'develop' · 7f6ccac6
  Seb Barnard authored 3 years ago
```
Added new default error page

See merge request !113
```
  7f6ccac6
- Added new default error page · 75344605
  Seb Barnard authored 3 years ago
  
  75344605
- Merge remote-tracking branch 'origin/develop' into develop · 6e6ba8d4
  Ethan Allen-Harris authored 3 years ago
  
  6e6ba8d4
- added sample data for presentation · 16a9c6fb
  Ethan Allen-Harris authored 3 years ago and Ethan Allen-Harris committed 3 years ago
```
Signed-off-by: c2064724 <allen-harrise@cardiff.ac.uk>
```
  16a9c6fb
- Error and success fields for user settings page · c255f359
  Joshua Gill authored 3 years ago
  
  c255f359
- added border radius to image · 967e4096
  John Watkins authored 3 years ago
  
  967e4096
- spacing · 9b75215b
  John Watkins authored 3 years ago
  
  9b75215b
- Merge branch 'develop' of git.cardiff.ac.uk:c2038058/ase_y2s1_cp_g4 into develop · 5bf963d5
  Ethan Allen-Harris authored 3 years ago
  
  5bf963d5
- finished off testing for stamps and claiming · 9161ba4d
  Ethan Allen-Harris authored 3 years ago
  
  9161ba4d
- Merge branch 'issueThirtySeven' into 'develop' · f243d2c9
  Seb Barnard authored 3 years ago
```
Issue thirty seven

See merge request !112
```
  f243d2c9
- 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