Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
522 commits
Select commit Hold shift + click to select a range
dfd48de
Remove log call from polar area draw.
etimberg Jul 5, 2015
0caa2a7
Legends for Line, Bar & Radar charts.
etimberg Jul 5, 2015
84aba3f
Polar area legends
etimberg Jul 5, 2015
925e305
Doughnut legends (only makes sense for first dataset).
etimberg Jul 5, 2015
f3eb6f4
Built legend version
etimberg Jul 5, 2015
f7dbb9d
Merge branch 'v2.0-dev' of https://github.com/nnnick/Chart.js into v2…
etimberg Jul 5, 2015
d3ffc7a
Auto Skip Labels Attempt 1
tannerlinsley Jul 7, 2015
68b2256
DatasetWidth now incorporates chartPaddingLeft
tannerlinsley Aug 3, 2015
452ef8b
No Logs
tannerlinsley Aug 3, 2015
f3303ce
Merge pull request #1354 from nnnick/v2.0-dev-feature-auto-skip-labels
etimberg Aug 3, 2015
26c210d
More Accurate animation frame dropper
tannerlinsley Aug 3, 2015
f3706b0
chart.update(0) now draws instantly instead of not at all
tannerlinsley Aug 4, 2015
31c5e45
Build
tannerlinsley Aug 4, 2015
0c6f37f
Add support for mirror option
bakura10 Aug 5, 2015
3f24389
Merge pull request #1357 from bakura10/mirror-linear-scale
etimberg Aug 5, 2015
f5b44ac
onAnimationComplete for zero-frame transitions
tannerlinsley Aug 7, 2015
ca0ece3
Added documentation for maxRotation of labels
pratyushmittal Aug 8, 2015
1cdc046
Update 00-Getting-Started.md
Aug 8, 2015
6f28711
Merge pull request #1365 from pratyushmittal/v2.0-dev
etimberg Aug 8, 2015
32f4f1e
Merge pull request #1367 from achichenin/patch-1
etimberg Aug 8, 2015
9dfa9e8
Fix the outerRadius calculation with respect to the border width. Pre…
etimberg Aug 8, 2015
87ac933
Linear scale has proper padding in both vertical and horizontal orien…
etimberg Aug 8, 2015
88896ab
During a mousemove event only re-render the chart instead of updating…
etimberg Aug 8, 2015
eb83372
initial logarithmic scale
etimberg Aug 8, 2015
94c1ec4
Fix for #1373
fastrde Aug 13, 2015
7f345f0
Merge pull request #1374 from fastrde/v2.0-dev
etimberg Aug 14, 2015
dd62944
Fix bracket placement
etimberg Aug 15, 2015
24a78e7
Proper template string caching
etimberg Aug 15, 2015
3dd2ee7
Merge branch 'v2.0-dev' of https://github.com/nnnick/Chart.js into fi…
etimberg Aug 15, 2015
fce1c42
Merge pull request #1380 from etimberg/fix/template-caching
etimberg Aug 22, 2015
de41329
Category scale now takes a smaller size if no labels are being displa…
etimberg Aug 22, 2015
fe427d6
Merge pull request #1403 from etimberg/fix/labelArea
etimberg Aug 22, 2015
86ecca1
If setLineDash is not available, do not set it.
etimberg Aug 22, 2015
dc81009
Merge pull request #1404 from etimberg/fix/setLineDash
etimberg Aug 22, 2015
02abc46
Count the number of bars when determining the bar width
etimberg Aug 22, 2015
28b3a90
Merge pull request #1406 from etimberg/fix/combo-bar-width
etimberg Aug 22, 2015
04d1f0f
Category scale filter function will hide the grid line if `null` or `…
etimberg Aug 23, 2015
8164418
Merge pull request #1407 from etimberg/fix/category-filter-lines
etimberg Aug 23, 2015
c1cca35
Initial test setup
etimberg Aug 23, 2015
f636a78
Watch mode runs tests.
etimberg Aug 23, 2015
b4b3bf6
Remove wrong addition of padding
etimberg Aug 23, 2015
e6dc2fd
Initial scale tests
etimberg Aug 23, 2015
bade753
Don't account for paddingLeft until after rotated
tannerlinsley Aug 28, 2015
bc3948c
Merge pull request #1408 from etimberg/feature/unit-test
tannerlinsley Aug 28, 2015
9c1a0cb
This should run the unit tests from the CI system
etimberg Aug 28, 2015
edf9517
Organize Gulpfile, Integrate unit tests with Travis
tannerlinsley Aug 28, 2015
92f1c65
Install coverage metrics. Use `gulp coverage` to generate coverage re…
etimberg Aug 28, 2015
2a49e22
Merge pull request #1423 from nnnick/v2.0-dev-unit-test-via-travis
etimberg Aug 28, 2015
7fed38f
Merge remote-tracking branch 'upstream/v2.0-dev' into feature/unit-test
etimberg Aug 28, 2015
1185208
Merge pull request #1424 from etimberg/feature/unit-test
tannerlinsley Aug 28, 2015
371bc89
Start writing tests for core.helpers. Fix a number of small bugs foun…
etimberg Aug 29, 2015
c09414c
First set of tests for point. Started on a mockContext object for tes…
etimberg Aug 29, 2015
f9a9e6b
Do mock context properties better
etimberg Aug 29, 2015
26684b6
Rectangle element tests
etimberg Aug 29, 2015
17c075e
Arc element tests
etimberg Aug 29, 2015
eadfbbe
Initial line element tests. Did not test the skipNull functionality s…
etimberg Aug 29, 2015
accb5ed
Merge pull request #1425 from etimberg/feature/unit-test
etimberg Aug 29, 2015
471618d
Initial bar controller tests
etimberg Aug 30, 2015
fcad4de
Finish up bar controller tests
etimberg Aug 30, 2015
8f97939
Merge pull request #1426 from etimberg/feature/unit-test
etimberg Aug 30, 2015
8e9de00
Doughnut controller tests
etimberg Aug 30, 2015
ce62307
Add line controller tests. Fixed an issue when the number of data poi…
etimberg Aug 30, 2015
c4da135
Merge pull request #1427 from etimberg/feature/unit-test
etimberg Aug 30, 2015
e681d8c
Better debug page reporting of failed tests
etimberg Aug 30, 2015
bb0a899
Core element tests
etimberg Aug 31, 2015
702b955
More helper tests
etimberg Aug 31, 2015
0813924
Merge pull request #1428 from etimberg/feature/unit-test
etimberg Aug 31, 2015
c8d5856
Start testing the linear scale fit code
etimberg Aug 31, 2015
02e0f3f
Check some more data on the linear scale after fitting
etimberg Aug 31, 2015
54858b9
More linear scale tests
etimberg Sep 1, 2015
f9eb8b1
Merge pull request #1429 from etimberg/feature/unit-test
etimberg Sep 1, 2015
eabdbab
If the element has a label, use that in the tooltip instead of the da…
etimberg Sep 1, 2015
f78ce21
Merge pull request #1430 from etimberg/feature/doughnutLabels
etimberg Sep 1, 2015
9cc2c18
Latest built changes
etimberg Sep 1, 2015
ef539bf
Reverse scale on radar/polar area
Sep 2, 2015
4d51f21
Merge pull request #1436 from honza889/reverse-radar
etimberg Sep 2, 2015
2f38a38
Get resize listener helper
etimberg Sep 5, 2015
6b6c388
Helper for resize listener
etimberg Sep 5, 2015
3f75aab
Better scale fitting algorithm to handle when label rotation changes …
etimberg Sep 5, 2015
a36a3f8
Commit built version of scale algo changes
etimberg Sep 10, 2015
98eea76
Do not test on gulp watch
tannerlinsley Sep 11, 2015
8762ae2
Add moment.js as dependency
tannerlinsley Sep 11, 2015
fe5ef15
Add Line chart with time scale sample
tannerlinsley Sep 11, 2015
c2a7e4c
Time Scale Base
tannerlinsley Sep 11, 2015
88d30d8
Let tooltips use time formatted labels if they exist
tannerlinsley Sep 11, 2015
e6220f4
Attempting to make resize better
etimberg Sep 14, 2015
77f90a8
Merge remote-tracking branch 'upstream/v2.0-dev' into feature/logarit…
etimberg Sep 14, 2015
b172a38
Remove dead code in logarithmic scale. Fixed a padding bug that had p…
etimberg Sep 14, 2015
e0cdfc6
Update logarithmic sample. Created a new logarithmic sample using AC …
etimberg Sep 14, 2015
c1f0a39
Fixes to show all lines but not all labels. Added a variable in the t…
etimberg Sep 15, 2015
eb657bc
Hide labels when the user returns null from the userCallback. This is…
etimberg Sep 15, 2015
c479022
Merge pull request #1456 from etimberg/feature/logarithmic_scale
tannerlinsley Sep 15, 2015
2598446
Time Scale Rewrite
tannerlinsley Sep 15, 2015
5ff2b53
Hover on dataset now works just like hover on label
mennodekker Sep 17, 2015
5047678
Tabs to spaces + fixed error
mennodekker Sep 17, 2015
a88d448
Merge pull request #1458 from mennodekker/patch-1
etimberg Sep 17, 2015
92682ab
Merge pull request #1459 from nnnick/v2.0-dev-feature-time-axis
tannerlinsley Sep 17, 2015
723c853
Unit tests for logarithmic scale. Fixed some issues in stacked mode s…
etimberg Sep 18, 2015
677c249
Bar and combo support for time scale
tannerlinsley Sep 18, 2015
bcbd9a8
Merge remote-tracking branch 'upstream/v2.0-dev' into feature/resize_…
etimberg Sep 18, 2015
52c1c09
Revert "Commit built version of scale algo changes"
etimberg Sep 18, 2015
db5066c
Remove core.responsive file. Responsiveness is added during initializ…
etimberg Sep 18, 2015
8d47693
Make sure that doughnut and polar area inner & outer radius is >= 0
etimberg Sep 18, 2015
97cec86
Only store the original device context ratio once
etimberg Sep 18, 2015
efa5ab7
Merge pull request #1467 from etimberg/feature/resize_problems
tannerlinsley Sep 19, 2015
862045e
Merge pull request #1465 from nnnick/v2.0-dev-time-scale-bars-and-combo
tannerlinsley Sep 19, 2015
9474d72
Revert "Fix resize problems when charts are initially hidden"
etimberg Sep 19, 2015
7d0a784
Merge pull request #1469 from nnnick/revert-1467-feature/resize_problems
etimberg Sep 19, 2015
39252d4
Use hidden iframe to detect resize + obey max width when getting maxi…
etimberg Sep 20, 2015
814c2d7
Remove responsive file since it is not necessary
etimberg Sep 20, 2015
8bddbff
Prevent a jump in the category scale when the labels need to rotate o…
etimberg Sep 20, 2015
8aa6288
Ensure that radii are always >= 0 for doughnuts and polar area charts
etimberg Sep 20, 2015
17cec52
Update charts with default aspect ratio of 1 where it makes sense. If…
etimberg Sep 20, 2015
162aaa9
Convert screen coordinates into canvas coordinates when dealing with …
etimberg Sep 20, 2015
b1060f2
Linear scale has labels
etimberg Sep 20, 2015
2667807
Logarithmic scale now has labels
etimberg Sep 20, 2015
9fecb37
Update tests for new config options
etimberg Sep 20, 2015
b7c7f1d
Category scale has labels
etimberg Sep 20, 2015
f4cdd20
Time scale has a label now
etimberg Sep 20, 2015
6ba0fc3
Update sample files
etimberg Sep 20, 2015
2e479e4
Update tests for new scale labels
etimberg Sep 20, 2015
d537366
Merge pull request #1470 from etimberg/feature/updated_resize_fix
tannerlinsley Sep 21, 2015
848710b
Merge pull request #1471 from etimberg/fix/mouse-coordinates
tannerlinsley Sep 21, 2015
2a76ff0
Time scale now draws all ticks, instead of half of them
tannerlinsley Sep 21, 2015
3ce06ab
Merge pull request #1473 from nnnick/v2.0-dev-timescale-fix
tannerlinsley Sep 21, 2015
154083b
Bar spacing is now dynamic at small sizes.
tannerlinsley Sep 21, 2015
e3e66d2
Time scale support
tannerlinsley Sep 21, 2015
01fdd38
Merge pull request #1474 from nnnick/v2.0-feature-dynamic-bar-spacing
tannerlinsley Sep 21, 2015
8c94ae0
Ensure bar width at least 1px
tannerlinsley Sep 21, 2015
301efac
Merge pull request #1477 from etimberg/feature/scale-labels
tannerlinsley Sep 21, 2015
416a6ac
Remove unneeded functions from core controller. Updated dataset contr…
etimberg Sep 22, 2015
4e536c5
Test missed in last check-in
etimberg Sep 22, 2015
029aad4
Update samples to no longer use old functions and instead modify the …
etimberg Sep 22, 2015
cd0b95d
Merge pull request #1478 from etimberg/feature/data-change-api
etimberg Sep 22, 2015
4a09319
Don't increase canvas css size during a retina scale. Reset the canva…
etimberg Sep 22, 2015
36493e0
Merge pull request #1480 from etimberg/fix/retina-scale-issue
tannerlinsley Sep 22, 2015
9b9ebca
Checkpoint 1, Pew!!!!
tannerlinsley Sep 23, 2015
c710767
Stuck on shared vertical scale draw logic
tannerlinsley Sep 24, 2015
e2a9650
Vertical Scales are a bit better now
tannerlinsley Sep 24, 2015
ca48caa
checkpoint for the morning check
tannerlinsley Sep 24, 2015
d7ab51f
Only rotate label while rotation is < maxRotation
Sep 24, 2015
b0679a8
Fixed label padding not affecting x-axis label
Sep 24, 2015
d1067f9
Merge pull request #1485 from BenWoodford/label-patches
etimberg Sep 24, 2015
d198157
Time Scale working, troubleshooting log scale
tannerlinsley Sep 24, 2015
440703e
Log Scale Working Again
tannerlinsley Sep 24, 2015
4c2027a
Horizontal Log Scale
tannerlinsley Sep 24, 2015
dc3f58f
Doughnut.color is outdated. Removing for now.
tannerlinsley Sep 24, 2015
8cda74e
Pie.customtooltips is outdated. Removing for now.
tannerlinsley Sep 24, 2015
1f0ee92
Polar Area now uses new scale.update method
tannerlinsley Sep 24, 2015
b22f569
Merge branch 'v2.0-dev' into v2.0-dev-refactor
tannerlinsley Sep 24, 2015
7372987
Add scaleLabel to core.scale
tannerlinsley Sep 24, 2015
505e6d7
Always includeOffset for bar controller
tannerlinsley Sep 24, 2015
f1b704a
Fix scale fitting to give padding around the scale title & to account…
etimberg Sep 24, 2015
2e2bbc9
Start to clean up the linear scale tests
etimberg Sep 24, 2015
cf944ae
Make sure ticks are converted to strings. Handle this in the core. Up…
etimberg Sep 25, 2015
b8d8ff8
I guess, don't include the offset. Bars now align correctly.
tannerlinsley Sep 25, 2015
3d1e1b1
Updated core.scale draw code with minor improvements and features tha…
etimberg Sep 26, 2015
68f563f
Merge branch 'v2.0-dev-refactor' of https://github.com/nnnick/Chart.j…
etimberg Sep 26, 2015
49a8b19
Update logX sample to use correct label callback
etimberg Sep 26, 2015
5156e63
Category scale tests
etimberg Sep 26, 2015
be4facd
Time scale tests.
etimberg Sep 27, 2015
bc7d1d3
Convert the radialLinear scale to derive from Core.scale. Radial line…
etimberg Sep 27, 2015
80b2ffe
Fix bar controller unit tests
etimberg Sep 27, 2015
4fd30e0
Last bar controller test fixes
etimberg Sep 27, 2015
7a0803c
Fix line controller tests
etimberg Sep 27, 2015
db3b5c1
Fix broken helper test
etimberg Sep 27, 2015
77faacb
Removed the line scale override file since functionality no longer di…
etimberg Sep 28, 2015
d09c25c
Merge pull request #1488 from nnnick/v2.0-dev-refactor
etimberg Sep 28, 2015
e6d1547
Commit built files after refactor
etimberg Sep 28, 2015
1bdf5ed
Time Scale now requires and warns for Moment.js dep
tannerlinsley Sep 28, 2015
63a0273
Remove moment and onecolor as deps
tannerlinsley Sep 28, 2015
39b15b9
Removed moment from build, import color lib first
tannerlinsley Sep 28, 2015
5a31c50
Built Dist Files
tannerlinsley Sep 28, 2015
c13d960
Built Dist Files (reduced lib to 122kb minified)
tannerlinsley Sep 28, 2015
5543041
Add Moment.js back into test reps
tannerlinsley Sep 28, 2015
4c79c57
Time Scale Samples updated to import moment beforehand
tannerlinsley Sep 28, 2015
e24406f
Ensure tickUnit and displayFormat set before format loop
tannerlinsley Sep 29, 2015
cd4b681
Dis Build
tannerlinsley Sep 29, 2015
39340fa
Update Getting Started and created Scales documentation
tannerlinsley Sep 29, 2015
8254124
Getting Started.... again.
tannerlinsley Sep 29, 2015
0ac59b8
Update README.md
tannerlinsley Sep 30, 2015
65f9ee8
Bubble Chart Type and Bubble Controller
tannerlinsley Oct 5, 2015
ef5cec7
Tooltips now using new lineArray format
tannerlinsley Oct 7, 2015
22e7934
Helper to determine if a dataset is visible or not
etimberg Oct 7, 2015
aaec5ef
Scales will only consider visible datasets when calculating data max …
etimberg Oct 7, 2015
b36c8ff
Update controllers to handle datasets that are not visible
etimberg Oct 7, 2015
0d2fa80
Update samples with some hidden datasets
etimberg Oct 7, 2015
81095e7
Merge pull request #1517 from nnnick/feature/hide-datasets
tannerlinsley Oct 8, 2015
a756e0d
Only merge scale defaults with the global scale defaults when getting…
etimberg Oct 12, 2015
1232ca5
Fix a race condition in the resize listener & use the correct merged …
etimberg Oct 12, 2015
93ee8f8
Put comment back in correct spot
etimberg Oct 12, 2015
3da66ba
Merge pull request #1525 from etimberg/fix/scale-merge
tannerlinsley Oct 12, 2015
b835d5f
Tooltip Hooks
tannerlinsley Oct 12, 2015
6001a1e
Fix JSHint task
etimberg Oct 13, 2015
e39298d
Before labels can rotate, we need the appropriate left, right, top, &…
etimberg Oct 13, 2015
6c4c469
Merge pull request #1526 from etimberg/fix/responsive-config-setting
tannerlinsley Oct 13, 2015
4a48e19
Fix HTMLIframeElement remove/removeNode issue in removeResizeListener…
lstyles Oct 16, 2015
04a0204
Merge pull request #1538 from lpaluszk/v2.0-dev
etimberg Oct 17, 2015
3699add
Use the correct font for the ticks. Ensure that scale labels fill in …
etimberg Oct 17, 2015
cb9860e
Merge pull request #1540 from nnnick/fix/scale-tick-font-size
tannerlinsley Oct 17, 2015
e091881
Testing fixes for time scale
tannerlinsley Oct 17, 2015
3d6ff09
Merge pull request #1541 from nnnick/v2.0-dev-testing-fixes
etimberg Oct 17, 2015
9526c77
Merge pull request #1512 from nnnick/v2.0-dev-bubble-controller
etimberg Oct 17, 2015
19a7c57
All tooltip callbacks support arrays for lines, and no drawing invisi…
tannerlinsley Oct 17, 2015
f650445
Use correct function to get `afterBody` lines for tooltip.
etimberg Oct 18, 2015
180209e
Factor out `getLabelForIndex` into each scale so we can return approp…
etimberg Oct 18, 2015
ceaa4ff
Add a helper function to reduce code size
etimberg Oct 18, 2015
7603b3c
Time scales now support passing in data as points. Added this to the …
etimberg Oct 18, 2015
082391e
Update docs a bit for new items. Small updates for tooltip labels.
etimberg Oct 18, 2015
2b057cf
Merge remote-tracking branch 'origin/v2.0-dev' into v2.0-dev-tooltip-…
etimberg Oct 18, 2015
86a52d0
Fix some test failures
etimberg Oct 18, 2015
d0475b8
Down to 3 test failures
etimberg Oct 18, 2015
5495a34
Fix 2 fails due to a bug fix for the scale label colour.
etimberg Oct 18, 2015
bfabac9
Labels are now optional for the time scale.
etimberg Oct 19, 2015
35011e5
Support min and max dates on time scale
tannerlinsley Oct 20, 2015
2e77651
Test in firefox on travis
etimberg Oct 21, 2015
351ccaf
Fix 2 test fails
etimberg Oct 21, 2015
e46a2cb
Fix JSHint errors
etimberg Oct 21, 2015
511e82a
Merge pull request #1551 from nnnick/travis-unit-test
tannerlinsley Oct 21, 2015
24e8fe3
Merge remote-tracking branch 'origin/v2.0-dev' into v2.0-dev-tooltip-…
etimberg Oct 22, 2015
854c1af
test fix
etimberg Oct 22, 2015
965d74e
Time scale test fix for optional labels
etimberg Oct 22, 2015
ef1c4fb
Fix typo in core.helpers.js
posgarou Oct 22, 2015
57979a2
Fix similar typos in core.controller & element
posgarou Oct 22, 2015
7a042bc
Merge pull request #1559 from posgarou/bugfix/chart_undefined_in_core…
tannerlinsley Oct 22, 2015
bc41909
Track lastTooltipActive for change animations
tannerlinsley Oct 23, 2015
60f2426
Only use active datasets in the tooltip body
tannerlinsley Oct 23, 2015
3a20d11
Merge pull request #1542 from nnnick/v2.0-dev-tooltip-refactor
tannerlinsley Oct 23, 2015
8081e9c
Bubble controller now skips on non-numerical coordinates
tannerlinsley Oct 23, 2015
ae0d9b0
Line controller now skips non-numerical coordinates
tannerlinsley Oct 23, 2015
afc40e7
Radar controller now skips non-numerical coordinates
tannerlinsley Oct 23, 2015
9d540ce
SplineCurve function now graciously handles skipped points
tannerlinsley Oct 23, 2015
7b13e90
Bad values for data are now converted to NaN
tannerlinsley Oct 23, 2015
e50d2f7
Point Skipping now draws properly and is easier to understand
tannerlinsley Oct 23, 2015
ea57100
Scale min/max calculations now disregard bad values
tannerlinsley Oct 23, 2015
0c3d9ec
Improved number format function. Also improved the generation of smal…
etimberg Oct 24, 2015
f22c0f3
Fix tests affected by changes to default label formatter
etimberg Oct 24, 2015
1c40d50
recursive and accurate getRightValue
tannerlinsley Oct 24, 2015
2cd4b13
radialLInear getPointPosition now rounds crazy decimals
tannerlinsley Oct 24, 2015
e7b71aa
Line element and controller tests now coincide with the latest skipNu…
tannerlinsley Oct 24, 2015
6adf39e
radialLinear scale tests now expect rounded values
tannerlinsley Oct 24, 2015
4d009d1
Use the new travis CI docker framework (hopefully)
tannerlinsley Oct 24, 2015
6dc651a
Merge pull request #1566 from nnnick/v2.0-dev-skip-null-fixes
tannerlinsley Oct 24, 2015
559ee62
Merge pull request #1567 from nnnick/fix/rounding
tannerlinsley Oct 24, 2015
a4d11bd
Built Distributables
tannerlinsley Oct 24, 2015
e816534
Updated Readme, and versions for beta release
tannerlinsley Oct 24, 2015
dac859e
Rename 01-Scales to 01-Scales.md
tannerlinsley Oct 26, 2015
74c04a3
Do not draw line up on first point of line
tannerlinsley Oct 27, 2015
85572d7
element.line.js now passes tests
tannerlinsley Oct 27, 2015
988034c
Scale expansion if min === max will only occur after ticks.beginAtZer…
etimberg Oct 28, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,7 @@ node_modules/*
custom/*

docs/index.md

bower_components/

coverage/*
6 changes: 6 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ node_js:
- "0.11"
- "0.10"

before_install:
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"

before_script:
- npm install

Expand All @@ -11,3 +15,5 @@ script:

notifications:
slack: chartjs:pcfCZR6ugg5TEcaLtmIfQYuA

sudo: false
8,108 changes: 5,514 additions & 2,594 deletions Chart.js

Large diffs are not rendered by default.

37 changes: 33 additions & 4 deletions Chart.min.js

Large diffs are not rendered by default.

26 changes: 25 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,34 @@
# Chart.js

[![Build Status](https://travis-ci.org/nnnick/Chart.js.svg?branch=master)](https://travis-ci.org/nnnick/Chart.js) [![Code Climate](https://codeclimate.com/github/nnnick/Chart.js/badges/gpa.svg)](https://codeclimate.com/github/nnnick/Chart.js)
[![Build Status](https://travis-ci.org/nnnick/Chart.js.svg?branch=v2.0-dev)](https://travis-ci.org/nnnick/Chart.js) [![Code Climate](https://codeclimate.com/github/nnnick/Chart.js/badges/gpa.svg)](https://codeclimate.com/github/nnnick/Chart.js)


*Simple HTML5 Charts using the canvas element* [chartjs.org](http://www.chartjs.org)

## v2.0 Beta

Current Release: [2.0.0-beta](https://github.com/nnnick/Chart.js/releases/tag/2.0.0-beta)

The next generation and release of Chart.js has been well under way this year and we are very close to releasing some amazing new features including, but not limited to:
- Rewritten, optimized, and unit-tested
- New and improved scales (log, time, linear, category, multiple scales)
- Improved responsiveness and resizing
- Powerful support for adding, removing, changing, and updating data on the fly
- Animations on all elements, colors and tooltips
- Powerful customization when you need it. Automatic and dynamic when you don't.
- Excellent support for modern frameworks and modular build systems.
- Even more extensible via new element controllers, combo chart support, and hook system
- Bug fixes not addressed in 1.x, and much, much more...

#####Contributing to 2.0
Submit PR's to the v2.0-dev branch.

#####Building and Testing
`gulp build`, `gulp test`

## v1.x Status: Feature Complete
We are now treating v1.x as feature complete. PR's for bug fixes are welcome, but we urge any open PR's for v1.x features to be refactored and resubmitted for v2.x (if the feature has not already been implemented).

## Documentation

You can find documentation at [chartjs.org/docs](http://www.chartjs.org/docs/). The markdown files that build the site are available under `/docs`. Please note - in some of the json examples of configuration you might notice some liquid tags - this is just for the generating the site html, please disregard.
Expand Down
22 changes: 12 additions & 10 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
{
"name": "Chart.js",
"version": "1.0.2",
"description": "Simple HTML5 Charts using the canvas element",
"homepage": "https://github.com/nnnick/Chart.js",
"author": "nnnick",
"main": [
"Chart.js"
],
"dependencies": {}
}
"name": "Chart.js",
"version": "2.0.0-beta",
"description": "Simple HTML5 Charts using the canvas element",
"homepage": "https://github.com/nnnick/Chart.js",
"author": "nnnick",
"main": [
"Chart.js"
],
"devDependencies": {
"jquery": "~2.1.4"
}
}
Loading