Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

M

Medarbetarpuls
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

a4fcc12d

Commit a4fcc12d authored 2 weeks ago by Johanna Lindquist

Downloads
- Plain Diff

Merge branch 'feature/setup_html_pages' into 'dev'

Feature/setup html pages

See merge request !17

parents a9a6ebca ac52384c

No related branches found

No related tags found

4 merge requests!54Sprint 2 merge,!32Sprint 1 merge,!29Dev,!17Feature/setup html pages

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

Medarbetarpuls/medarbetarapp/static/go-back-btn.png 0 additions, 0 deletions

Medarbetarpuls/medarbetarapp/static/go-back-btn.png
Medarbetarpuls/medarbetarapp/static/styles.css 42 additions, 14 deletions

Medarbetarpuls/medarbetarapp/static/styles.css
Medarbetarpuls/medarbetarapp/templates/add_employee.html 62 additions, 0 deletions

Medarbetarpuls/medarbetarapp/templates/add_employee.html
Medarbetarpuls/medarbetarapp/templates/my_org.html 3 additions, 1 deletion

Medarbetarpuls/medarbetarapp/templates/my_org.html
Medarbetarpuls/medarbetarapp/templates/settings_user.html 1 addition, 1 deletion

Medarbetarpuls/medarbetarapp/templates/settings_user.html
Medarbetarpuls/medarbetarapp/views.py 2 additions, 3 deletions

Medarbetarpuls/medarbetarapp/views.py

with 110 additions and 19 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment