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

2fd9c69d

Commit 2fd9c69d authored 9 years ago by Jay Alvarez

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/chart_widget' into theming

parents f448fd18 88d01313

Branches

No related tags found

No related merge requests found

Changes 7

Expand all Hide whitespace changes

Inline Side-by-side

Showing

django/website/hid/static/hid/widgets/chart.js 73 additions, 34 deletions

django/website/hid/static/hid/widgets/chart.js
django/website/hid/templates/hid/widgets/chart.html 0 additions, 1 deletion

django/website/hid/templates/hid/widgets/chart.html
django/website/hid/tests/chart_widget_tests.py 41 additions, 0 deletions

django/website/hid/tests/chart_widget_tests.py
django/website/hid/widgets/chart.py 22 additions, 5 deletions

django/website/hid/widgets/chart.py
django/website/media/js/backbone.js 1873 additions, 0 deletions

django/website/media/js/backbone.js
django/website/media/js/underscore.js 1548 additions, 0 deletions

django/website/media/js/underscore.js
django/website/templates/base.html 3 additions, 1 deletion

django/website/templates/base.html

with 3560 additions and 41 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