ZAINABS work + my basic list locations page and route to help with this issue (!50) · Merge requests · Arianne Bayliss / ProjectClient_Y1S1_tramshedTech_team15 · GitLab

Snippets Groups Projects

Closed Liam Driscoll requested to merge 14-as-a-user-i-want-to-view-a-list-of-all-locations-available into development 2 years ago

Dec 09, 2022
- Re-adding CSV. · d22eb383
  Liam Driscoll authored 2 years ago
  
  d22eb383
- Removing CSV · 746a1cc7
  Liam Driscoll authored 2 years ago
  
  746a1cc7
- Resolving conflicts. · e9f2e1d4
  Liam Driscoll authored 2 years ago
  
  e9f2e1d4
- Resolving conflict. · 9ca6d9f7
  Liam Driscoll authored 2 years ago
  
  9ca6d9f7
- Adding a basic location list and a route to call the locations for a basis to work off of. · 349b4e8c
  Liam Driscoll authored 2 years ago
  
  349b4e8c
- Merge branch 'development' into '14-as-a-user-i-want-to-view-a-list-of-all-locations-available' · 7fca490a
  Liam Driscoll authored 2 years ago
```
# Conflicts:
#   coworking_spaces.csv
```
  7fca490a
- Merge branch 'development' into '14-as-a-user-i-want-to-view-a-list-of-all-locations-available' · e02ad521
  Zainab Almeshari authored 2 years ago
```
# Conflicts:
#   project_server.py
```
  e02ad521
- form, templating, database connection and some CSS updates · a66ff61b
  Zainab Almeshari authored 2 years ago
  
  a66ff61b