Commits · 47b8f6c5089f69ca30d7ceac05a4dfd783c8785c · Beaumont Mogridge / ProjectClient_Y1S1_TramshedTech_15.git · GitLab

Snippets Groups Projects

Dec 13, 2021
- Issue resloved · 47b8f6c5
  Rhiannon Austin authored Dec 13, 2021
  
  47b8f6c5
- Fixing for merge · 24ab791a
  Rhiannon Austin authored Dec 13, 2021
  
  24ab791a
- Fixing conflicts · 920eb783
  Rhiannon Austin authored Dec 13, 2021
  
  920eb783
Dec 10, 2021
- Login Update · ce95164c
  Rhiannon Austin authored Dec 10, 2021
  
  ce95164c
Dec 08, 2021
- Login Working · 721ef21a
  Rhiannon Austin authored Dec 8, 2021
  
  721ef21a
Dec 03, 2021
- fix typo for add workspace label · 5637dcc9
  Robert Metcalf authored Dec 3, 2021
  
  5637dcc9
- Merge branch 'main' of git.cardiff.ac.uk:c21070842/client-project-15 into main · 0bd64197
  Zak Demetriades authored Dec 3, 2021
  
  0bd64197
- commit · 5a4409d1
  Zak Demetriades authored Dec 3, 2021
  
  5a4409d1
- Merge branch 'Filtering' into 'main' · eee8f2db
  Beaumont Mogridge authored Dec 3, 2021
  eee8f2db
- Adding filtering system · bb5770c8
  Zak Demetriades authored Dec 3, 2021
  
  bb5770c8
Dec 02, 2021
- Merge branch 'addedHtmlPagesAndUserInterface' into 'main' · c1a4ed26
  Beaumont Mogridge authored Dec 2, 2021
  c1a4ed26
Dec 01, 2021
- Update style.css changed colours to improve ui and added header css · 517f902a
  Beaumont Mogridge authored Dec 1, 2021
  
  517f902a
- Update main.html added text bar · a74e61ea
  Beaumont Mogridge authored Dec 1, 2021
  
  a74e61ea
- Update main.py added contact-us.html and about.html · 0871e295
  Beaumont Mogridge authored Dec 1, 2021
  
  0871e295
- contact info needing o be added · 55addcb3
  Beaumont Mogridge authored Dec 1, 2021
  
  55addcb3
- Upload New File · bff92781
  Beaumont Mogridge authored Dec 1, 2021
  
  bff92781
- about page template · 8d6fcc41
  Beaumont Mogridge authored Dec 1, 2021
  
  8d6fcc41
- Merge branch '6-as-a-moderator-i-want-to-be-able-to-add-working-spaces' into 'main' · 4ce78538
  Beaumont Mogridge authored Dec 1, 2021
  4ce78538
Nov 30, 2021
- turn form into a table · a3b62f43
  Robert Metcalf authored Nov 30, 2021
  
  a3b62f43
- add page to add workspaces · a989a1b7
  Robert Metcalf authored Nov 26, 2021
  
  a989a1b7
- change import database tool to import from JSON · 5e6a688b
  Robert Metcalf authored Nov 26, 2021
  
  5e6a688b
- enable noscript message and open website in new tab · 9de2d5c9
  Robert Metcalf authored Nov 30, 2021
  
  9de2d5c9
- add interactive map and lookup from address to latitude and longitude · f138bc8a
  Robert Metcalf authored Nov 23, 2021
  
  f138bc8a
- open website in new tab · d5359632
  Robert Metcalf authored Nov 30, 2021
  
  d5359632
Nov 26, 2021
- fixing login · 3df165a3
  Rhiannon Austin authored Nov 26, 2021
  
  3df165a3
Nov 25, 2021
- Adding Login · e3cb39ad
  Rhiannon Austin authored Nov 25, 2021
  
  e3cb39ad
- Updating Login · a9ae5867
  Rhiannon Austin authored Nov 25, 2021
  
  a9ae5867
- Merge branch 'WebPages' into 'main' · 69cbe6fc
  Rhiannon Austin authored Nov 25, 2021
  69cbe6fc
- Merge branch 'main' into 'WebPages' · ea9adc42
  Rhiannon Austin authored Nov 25, 2021
  ea9adc42
Nov 23, 2021
- download fonts, correct navbar links and add website to workspace list items · 2977d1e7
  Robert Metcalf authored Nov 23, 2021
  
  2977d1e7
- restructure and style workspace items on homepage · 29be204b
  Robert Metcalf authored Nov 23, 2021
  
  29be204b
- Login system first draft · 391a89a7
  Rhiannon Austin authored Nov 23, 2021
  
  391a89a7
Nov 19, 2021
- Adding cvs data given · 28f1fada
  Rhiannon Austin authored Nov 19, 2021
  
  28f1fada
- setup Pipfile and fix additional photos query (again) · d9b76f3e
  Robert Metcalf authored Nov 19, 2021
  
  d9b76f3e
- correct typo with additional photos query · a3017fbf
  Robert Metcalf authored Nov 19, 2021
  
  a3017fbf
- Merge branch 'server' into 'main' · 7ac58396
  Robert Metcalf authored Nov 19, 2021
  7ac58396
- move static files into static, correct styles to only work on the navbar · 9331c35c
  Robert Metcalf authored Nov 19, 2021
  
  9331c35c
- show workspaces on home page · fd0d8e78
  Robert Metcalf authored Nov 19, 2021
  
  fd0d8e78
- add initial database with workspace support · a6a320f5
  Robert Metcalf authored Nov 19, 2021
  
  a6a320f5
- add basic flask server and main template based on home.html · f12e3550
  Robert Metcalf authored Nov 19, 2021
  
  f12e3550