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

0ae59bf8

Commit 0ae59bf8 authored 9 years ago by Alice Heaton

:speech_balloon:

Downloads
- Plain Diff

Merge branch 'chart_widget' into staging

parents 4a08ba11 e57b11f2

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

deploy/pip_packages.txt 1 addition, 0 deletions

deploy/pip_packages.txt
django/website/hid/migrations/0001_initial.py 74 additions, 0 deletions

django/website/hid/migrations/0001_initial.py
django/website/hid/static/hid/widgets/chart.js 22 additions, 12 deletions

django/website/hid/static/hid/widgets/chart.js
django/website/hid/templates/hid/tests/chart.html 59 additions, 0 deletions

django/website/hid/templates/hid/tests/chart.html
django/website/hid/templatetags/json_data.py 1 addition, 1 deletion

django/website/hid/templatetags/json_data.py
django/website/hid/tests/chart_javascript_tests.py 13 additions, 0 deletions

django/website/hid/tests/chart_javascript_tests.py
django/website/local_settings.py.dev 2 additions, 1 deletion

django/website/local_settings.py.dev
django/website/settings.py 1 addition, 0 deletions

django/website/settings.py
django/website/urls.py 1 addition, 1 deletion

django/website/urls.py

with 174 additions and 15 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