Commits · 15-add-form-for-adding-latitude-and-longitude-positions · Beaumont Mogridge / ProjectClient_Y1S1_TramshedTech_15.git

View open merge request

Dec 14, 2021
- add interfaces to set latitude and longitude information · b3213e9e
  Robert Metcalf authored 3 years ago
  
  b3213e9e
- add CSV upload interface, support updating workspaces in place · e9eca452
  Robert Metcalf authored 3 years ago
  
  e9eca452
- handle addresses without latlong on interactive map · 026e479e
  Robert Metcalf authored 3 years ago
  
  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
  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
  
  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
  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
  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
  4ce78538
Nov 30, 2021
- turn form into a table · a3b62f43
  Robert Metcalf authored 3 years ago
  
  a3b62f43
- add page to add workspaces · a989a1b7
  Robert Metcalf authored 3 years ago
  
  a989a1b7
- change import database tool to import from JSON · 5e6a688b
  Robert Metcalf authored 3 years ago
  
  5e6a688b
- enable noscript message and open website in new tab · 9de2d5c9
  Robert Metcalf authored 3 years ago
  
  9de2d5c9
- add interactive map and lookup from address to latitude and longitude · f138bc8a
  Robert Metcalf authored 3 years ago
  
  f138bc8a
- open website in new tab · d5359632
  Robert Metcalf authored 3 years ago
  
  d5359632
Nov 26, 2021
- fixing issues · f3fe5bf7
  Rhiannon Austin authored 3 years ago
  
  f3fe5bf7
- fixing main.py issues and moving login to templates · cb1df5c5
  Rhiannon Austin authored 3 years ago
  
  cb1df5c5