Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

I

internewshid
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

521bb1e9

Commit 521bb1e9 authored 9 years ago by Marko Samastur

Downloads
- Plain Diff

Merge branch 'minimal_dashboard_design' into develop

Resolved conflicts:
	django/website/local_settings.py.jenkins

parents b5dca31b db9b89f2

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

deploy/pip_packages.txt 1 addition, 0 deletions

deploy/pip_packages.txt
django/website/hid/templates/hid/dashboard.html 2 additions, 2 deletions

django/website/hid/templates/hid/dashboard.html
django/website/media/css/styles.css 17 additions, 0 deletions

django/website/media/css/styles.css
django/website/settings.py 1 addition, 1 deletion

django/website/settings.py
django/website/templates/base.html 25 additions, 1 deletion

django/website/templates/base.html
django/website/templates/registration/logged_out.html 2 additions, 2 deletions

django/website/templates/registration/logged_out.html
django/website/templates/registration/login.html 9 additions, 7 deletions

django/website/templates/registration/login.html

with 57 additions and 13 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

Webarchitects | Forum | Status | SSH Fingerprints