Commits · main · Beaumont Mogridge / ProjectClient_Y1S1_TramshedTech_15.git

Jan 10, 2022
- Merge branch 'main' of https://git.cardiff.ac.uk/c21070842/client-project-15 · 661d52bd
  Rhiannon Austin authored 3 years ago
  
  661d52bd
- fixing · fba4231d
  Rhiannon Austin authored 3 years ago
  
  fba4231d
Dec 14, 2021
- Upload New File · c507c1e2
  Beaumont Mogridge authored 3 years ago
  
  c507c1e2
- Delete 5f183b3382797afc8bf004a9_Tramshed_Tech_Hero_Video-transcode.gif · f75234b9
  Beaumont Mogridge authored 3 years ago
  
  f75234b9
- Upload New File · 75f02335
  Beaumont Mogridge authored 3 years ago
  
  75f02335
- Adding all working spaces to database · 1257a286
  Rhiannon Austin authored 3 years ago
  
  1257a286
- Merge branch 'added-message-board.html' into 'main' · dec05803
  Beaumont Mogridge authored 3 years ago
```
added message board.html

See merge request !20
```
  dec05803
- Merge branch 'added-message.js' into 'main' · f066afd0
  Beaumont Mogridge authored 3 years ago
```
message.js

See merge request !22
```
  f066afd0
- Upload New File · 6effca9f
  Beaumont Mogridge authored 3 years ago
  
  6effca9f
- Upload New File · f13a42e2
  Beaumont Mogridge authored 3 years ago
  
  f13a42e2
- handle addresses without latlong on interactive map · 026e479e
  Robert Metcalf authored 3 years ago
  
  Verified
  
  026e479e
- Login css improved · eab33bf9
  Rhiannon Austin authored 3 years ago
  
  eab33bf9
- Fixing location html + adding to database workspaces · e41d760c
  Rhiannon Austin authored 3 years ago
  
  e41d760c
- forgot to update login.html · d18cc9f3
  Rhiannon Austin authored 3 years ago
  
  d18cc9f3
- Trying to fix merge conflicts · 55e29b09
  Rhiannon Austin authored 3 years ago
  
  55e29b09
- Merge branch 'login' into 'main' · 616dd5a5
  Rhiannon Austin authored 3 years ago
```
Login

See merge request !18
```
  616dd5a5
- Completed Login Page · e8f7f9a0
  Rhiannon Austin authored 3 years ago
  
  e8f7f9a0
- Finished css · 453cd5e8
  Rhiannon Austin authored 3 years ago
  
  453cd5e8
Dec 13, 2021
- Issue resloved · 47b8f6c5
  Rhiannon Austin authored 3 years ago
  
  47b8f6c5
- Fixing for merge · 24ab791a
  Rhiannon Austin authored 3 years ago
  
  24ab791a
- Fixing conflicts · 920eb783
  Rhiannon Austin authored 3 years ago
  
  920eb783
- Update contact-us.html · a1bac372
  Beaumont Mogridge authored 3 years ago
  
  a1bac372
- Update workspaces.json · 588b75e2
  Beaumont Mogridge authored 3 years ago
  
  588b75e2
Dec 10, 2021
- Login Update · ce95164c
  Rhiannon Austin authored 3 years ago
  
  ce95164c
Dec 08, 2021
- Login Working · 721ef21a
  Rhiannon Austin authored 3 years ago
  
  721ef21a
- Login Working · 9b690021
  Rhiannon Austin authored 3 years ago
  
  9b690021
- Login Working · db120bd5
  Rhiannon Austin authored 3 years ago
  
  db120bd5
Dec 03, 2021
- fix typo for add workspace label · 5637dcc9
  Robert Metcalf authored 3 years ago
  
  Verified
  
  5637dcc9
- Merge branch 'main' of git.cardiff.ac.uk:c21070842/client-project-15 into main · 0bd64197
  Zak Demetriades authored 3 years ago
  
  0bd64197
- commit · 5a4409d1
  Zak Demetriades authored 3 years ago
  
  5a4409d1
- Merge branch 'Filtering' into 'main' · eee8f2db
  Beaumont Mogridge authored 3 years ago
```
Adding filtering system

See merge request !14
```
  eee8f2db
- Adding filtering system · bb5770c8
  Zak Demetriades authored 3 years ago
  
  bb5770c8
Dec 02, 2021
- Merge branch 'addedHtmlPagesAndUserInterface' into 'main' · c1a4ed26
  Beaumont Mogridge authored 3 years ago
```
Added html pages and user interface

See merge request !10
```
  c1a4ed26
Dec 01, 2021
- Update style.css changed colours to improve ui and added header css · 517f902a
  Beaumont Mogridge authored 3 years ago
  
  517f902a
- Update main.html added text bar · a74e61ea
  Beaumont Mogridge authored 3 years ago
  
  a74e61ea
- Update main.py added contact-us.html and about.html · 0871e295
  Beaumont Mogridge authored 3 years ago
  
  0871e295
- contact info needing o be added · 55addcb3
  Beaumont Mogridge authored 3 years ago
  
  55addcb3
- Upload New File · bff92781
  Beaumont Mogridge authored 3 years ago
  
  bff92781
- about page template · 8d6fcc41
  Beaumont Mogridge authored 3 years ago
  
  8d6fcc41
- Merge branch '6-as-a-moderator-i-want-to-be-able-to-add-working-spaces' into 'main' · 4ce78538
  Beaumont Mogridge authored 3 years ago
```
Allow working spaces to be added

Closes #6

See merge request !8
```
  4ce78538