Merge branch 'development' into '14-as-a-user-i-want-to-view-a-list-of-all-locations-available'
# Conflicts: # project_server.py
No related branches found
No related tags found
Showing
- project_server.py 97 additions, 68 deletionsproject_server.py
- static/CSS/Manage_Coworking_Spaces.css 12 additions, 8 deletionsstatic/CSS/Manage_Coworking_Spaces.css
- static/CSS/loginstyle.css 4 additions, 0 deletionsstatic/CSS/loginstyle.css
- static/JS/Manage_Coworking_Spaces.js 11 additions, 1 deletionstatic/JS/Manage_Coworking_Spaces.js
- static/Manage_Coworking_Spaces.html 0 additions, 94 deletionsstatic/Manage_Coworking_Spaces.html
- static/landingpage.html 2 additions, 2 deletionsstatic/landingpage.html
- static/login.html 12 additions, 0 deletionsstatic/login.html
- templates/Manage_Coworking_Spaces.html 50 additions, 0 deletionstemplates/Manage_Coworking_Spaces.html
- templates/base_template.html 13 additions, 18 deletionstemplates/base_template.html
- testloginserver.py 46 additions, 0 deletionstestloginserver.py
Loading
Please register or sign in to comment