Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1078 commits
Select commit Hold shift + click to select a range
46861c9
Update bar controller tests
etimberg Jan 9, 2016
6b28790
Merge pull request #1877 from nnnick/fix/1862
etimberg Jan 9, 2016
1202c03
Update build
etimberg Jan 9, 2016
8c68f78
Don't try to use undefined Scale constructors
etimberg Jan 9, 2016
956b1dd
Merge pull request #1878 from nnnick/fix/1871
etimberg Jan 9, 2016
5070059
Add template option for point labels + test + doc update
etimberg Jan 9, 2016
0ed27d4
Make sure tick string could be null / undefined
etimberg Jan 9, 2016
ff94a54
Merge pull request #1879 from nnnick/fix/1110
etimberg Jan 9, 2016
88fc6ec
Fix orf/olf being undefined
Jan 12, 2016
307d02b
Merge pull request #1892 from davis/v2.0-dev
etimberg Jan 12, 2016
977d45a
Add some optimizations to often used functions
mathiask88 Jan 12, 2016
7735371
Merge pull request #1893 from mathiask88/updateOptimizations
etimberg Jan 12, 2016
24e4a92
Add option to disable line drawing
mathiask88 Jan 14, 2016
b756507
Merge pull request #1887 from mathiask88/v2.0-dev
etimberg Jan 14, 2016
25d6c2f
Removes unused context bindings
mathiask88 Jan 14, 2016
4f6e866
Adds a caching system to expensive measureText() function
mathiask88 Jan 15, 2016
19613f5
Just assign instead of extend
mathiask88 Jan 15, 2016
fa7baa1
Do not calculate control points if we want straight lines
mathiask88 Jan 15, 2016
c42cb14
Transition optimizations
mathiask88 Jan 15, 2016
f6b18a5
Merge pull request #1900 from mathiask88/smallOptimizations
etimberg Jan 16, 2016
655c115
Adds different point styles
mathiask88 Jan 16, 2016
2db334d
Merge pull request #1905 from mathiask88/pointStyles
etimberg Jan 16, 2016
1de0435
Fix reversed ticks on linear scale + update test
etimberg Jan 18, 2016
00913be
Merge pull request #1908 from nnnick/fix/1907
etimberg Jan 18, 2016
33303d8
Fixes resize() function
mathiask88 Jan 18, 2016
8e681a6
Merge pull request #1911 from mathiask88/fixResize
etimberg Jan 18, 2016
b282a01
Fixes rect size
mathiask88 Jan 18, 2016
62988e9
Merge pull request #1912 from mathiask88/pointStyleFix
etimberg Jan 18, 2016
2d4e2f9
Properly begin path before drawing line at edge of scale
etimberg Jan 19, 2016
3c614a5
Merge pull request #1915 from nnnick/fix/1914
etimberg Jan 19, 2016
c8ea3af
All sample files use CDN version of jQuery to make getting started ea…
etimberg Jan 22, 2016
cfb06ed
Merge pull request #1927 from nnnick/fix/1918
etimberg Jan 22, 2016
76ef7de
Fix sample file addData button
etimberg Jan 22, 2016
59e3ccb
buildOrUpdateControllers now returns an array of all the new controll…
etimberg Jan 22, 2016
888379e
Merge pull request #1929 from nnnick/fix/1917
etimberg Jan 22, 2016
c312835
Add some tests for scales. Cleaned up some minor bugs in the time sca…
etimberg Jan 23, 2016
0ed39c9
Fix error in math helpers.
etimberg Jan 24, 2016
68ab74a
Fix linear scale stacked mode
etimberg Jan 24, 2016
d0b67c6
Line and bar test updates
etimberg Jan 24, 2016
6aa2933
Bubble controller tests
etimberg Jan 24, 2016
d0a0d57
Initial polar area tests
etimberg Jan 24, 2016
0890c80
default config tests
etimberg Jan 24, 2016
bfd6f5f
Radar controller tests
etimberg Jan 27, 2016
212b6d3
Merge pull request #1938 from nnnick/testing_improvements
etimberg Jan 27, 2016
1afe9f1
Built files with latest changes
etimberg Jan 30, 2016
f75116a
Update millisecond default format. Removed unnecessary space at right…
etimberg Jan 30, 2016
172c088
Minor fix
etimberg Jan 30, 2016
16dc9e6
Merge pull request #1950 from nnnick/fix/time-scale-min-max
etimberg Feb 1, 2016
0e8babf
Fix stacked bar data limit calculation
etimberg Feb 1, 2016
9ed8859
Merge pull request #1963 from nnnick/fix/1952
etimberg Feb 1, 2016
aafe21d
New built files
etimberg Feb 1, 2016
d16f4fc
Add default font options
etimberg Feb 2, 2016
25e787c
Merge pull request #1964 from nnnick/feature/1954
etimberg Feb 2, 2016
dfaf786
Always show lines by default.
etimberg Feb 3, 2016
73300e9
Merge pull request #1972 from nnnick/fix/1971
etimberg Feb 3, 2016
e7df265
Fixed label callbacks adding only a single line instead of multiple l…
Feb 4, 2016
ba6afa7
Fixed label callbacks adding only a single line instead of multiple l…
Feb 4, 2016
df218ea
Merge branch 'v2.0-dev' of github.com:roben/Chart.js into v2.0-dev
Feb 4, 2016
9a20381
Fixed typo in core.helpers.js.
Feb 4, 2016
0972140
Removed debug log.
Feb 4, 2016
80ede9b
Added documentation for fixedStepSize.
Feb 5, 2016
85de9fb
Further reformatted scale.linear.js to match original indenting.
Feb 5, 2016
098b05f
Further reformatted scale.linear.js to match original indenting.
Feb 5, 2016
1692b97
Fixed tab sizing in core.helpers.js
Feb 5, 2016
92bc1a0
Chart.js was missing?
Feb 5, 2016
ada4c8e
Removed nbproject folder
Feb 5, 2016
61ca178
Write an almost equals function and use it in the linear scale. Added…
etimberg Feb 6, 2016
e931276
Merge pull request #1984 from nnnick/fix/1890
etimberg Feb 6, 2016
9cf31da
Add docs for global font options
etimberg Feb 8, 2016
ee16c1e
Update docs for #1144
etimberg Feb 8, 2016
7235d82
Merge pull request #1985 from nnnick/fix/1144
etimberg Feb 8, 2016
84ed07a
Update bar sample file to use elements config. Fixes #1292
etimberg Feb 8, 2016
eb7241c
Merge pull request #1986 from nnnick/fix/1292
etimberg Feb 8, 2016
e9c18f6
Merged remote-tracking branch 'upstream/v2.0-dev' into v2.0-dev to fi…
Feb 9, 2016
55f9b68
Updated build and documentation
Feb 9, 2016
a3dea11
Merge pull request #1978 from roben/v2.0-dev
etimberg Feb 9, 2016
09783be
Merge branch 'v2.0-dev' into fix-legend-tooltip-stacked-ordering
tannerlinsley Feb 10, 2016
f2780bb
Browserify for easier UMD consumptions and vanilla builds
tannerlinsley Feb 12, 2016
007d029
Bundled builds
tannerlinsley Feb 12, 2016
813d18b
Passing All Tests, Updated Dependencies
tannerlinsley Feb 12, 2016
999125c
Testing for the new build system
tannerlinsley Feb 12, 2016
eb01a0d
Core helpers reference
tannerlinsley Feb 12, 2016
c5020c3
Updated Samples
tannerlinsley Feb 12, 2016
2f5e092
Built Files
tannerlinsley Feb 12, 2016
eb2b04a
Documentation Updates for UMD support
tannerlinsley Feb 13, 2016
d9af94a
Merge pull request #2007 from nnnick/browserify-build-system
tannerlinsley Feb 13, 2016
f695181
Improve joshing reporting. Added a JSHint config file.
etimberg Feb 14, 2016
96551c2
begin fixing coverage tests
etimberg Feb 14, 2016
a84f9d9
Update other test tasks to use karma-browserify
etimberg Feb 14, 2016
3226dfa
coverage report works
etimberg Feb 14, 2016
489f7ce
use a new node version
etimberg Feb 14, 2016
38b2925
Use coveralls to report lines of coverage and add a badge to the readme
etimberg Feb 14, 2016
766b748
Run coverage properly on the CI
etimberg Feb 14, 2016
d366f2b
Merge pull request #2013 from nnnick/fix-coverage-report
etimberg Feb 14, 2016
58fcb37
fix typo in readme
etimberg Feb 14, 2016
41f2b57
Add codeclimate config
etimberg Feb 14, 2016
0732793
explicitly run certain engines
etimberg Feb 14, 2016
172839a
try and make this work
etimberg Feb 14, 2016
db20731
improve syntax
etimberg Feb 14, 2016
1dc943d
updates from running code climate locally
etimberg Feb 14, 2016
a79d365
add some more reporters
etimberg Feb 14, 2016
7562084
Merge pull request #2014 from nnnick/update-code-climate-config
etimberg Feb 14, 2016
01b88f1
Clean up code climate style issues and formatting.
etimberg Feb 14, 2016
e589734
Title block tests
etimberg Feb 14, 2016
37b3fb5
Legend tests + fix minor bug where padding was not taken into account…
etimberg Feb 15, 2016
309ab1f
Disable autoskipper for time scales
etimberg Feb 15, 2016
2672efa
Merge pull request #2015 from nnnick/fix/1962
etimberg Feb 15, 2016
4c35bba
When the last label would overlap with the previously shown label, sk…
etimberg Feb 15, 2016
c3149a9
Merge pull request #2017 from nnnick/fix/1884
etimberg Feb 15, 2016
d31db87
Updated build
etimberg Feb 15, 2016
ac5be9b
Proper line and bar stacking order
tannerlinsley Feb 17, 2016
ee81d4a
Reversible Legends
tannerlinsley Feb 17, 2016
50d0c98
Tooltips now respect stacked ordering
tannerlinsley Feb 17, 2016
f572125
Merge pull request #2027 from nnnick/fix-stacking-order-and-reversabl…
tannerlinsley Feb 17, 2016
86b9139
Adds the ability to draw custom point styles
mathiask88 Feb 7, 2016
1bebda8
Merge pull request #2031 from mathiask88/customPointStyle
etimberg Feb 18, 2016
f5a2e39
Fix radius 0
etimberg Feb 20, 2016
cfd3ebb
Merge pull request #2041 from nnnick/fix/radius-0
etimberg Feb 20, 2016
0f6e329
fix alpha for tooltip colors
hamalaiv Feb 25, 2016
6ad533c
Merge pull request #2057 from hamalaiv/fix/2036
etimberg Feb 27, 2016
b812bcc
Fix #2009
etimberg Feb 27, 2016
5fe1914
Merge pull request #2065 from nnnick/fix/2009
etimberg Feb 27, 2016
96315dd
Much faster cache clean up
mathiask88 Feb 27, 2016
1cc9184
Merge pull request #2066 from mathiask88/cacheCleanupFix
etimberg Feb 27, 2016
04e6926
Fix bar chart and doughnut chart animations
etimberg Feb 27, 2016
431f930
Merge pull request #2067 from nnnick/fix/animations
etimberg Feb 27, 2016
521236b
improve bubble chart sample
hamalaiv Feb 28, 2016
4729b05
improve line chart sample
hamalaiv Feb 28, 2016
dae599e
improve line-customTooltips sample
hamalaiv Feb 28, 2016
87633f6
improve line-legend sample
hamalaiv Feb 28, 2016
1f8709f
fix x-axis labels when adding data
hamalaiv Feb 28, 2016
a7b1646
improve line-logarithmic sample
hamalaiv Feb 28, 2016
48cb104
improve line-logarithmic sample
hamalaiv Feb 28, 2016
cd52936
improve line-skip-points sample
hamalaiv Feb 28, 2016
194c11c
improve line-stacked-area sample
hamalaiv Feb 28, 2016
aa604af
improve line-x-axis-filter sample
hamalaiv Feb 28, 2016
428567d
improve radar sample
hamalaiv Feb 28, 2016
c7845d1
improve radar-skip-points sample
hamalaiv Feb 28, 2016
9d210d8
improve tooltip-hooks sample
hamalaiv Feb 28, 2016
f23b640
improve progress-bar sample
hamalaiv Feb 28, 2016
0480f2e
improve progress-bar sample
hamalaiv Feb 28, 2016
14fd5de
improve combo-time-scale sample
hamalaiv Feb 28, 2016
2513d5d
improve time-scale sample
hamalaiv Feb 28, 2016
72f5926
fix titles
hamalaiv Feb 28, 2016
e7233c2
improve bar-multi-axis sample
hamalaiv Feb 28, 2016
680fa8a
improve bar-stacked sample
hamalaiv Feb 28, 2016
0985e6d
improve bar sample
hamalaiv Feb 28, 2016
5602826
improve combo-bar-line sample
hamalaiv Feb 28, 2016
595464f
improve polar-area sample
hamalaiv Feb 28, 2016
94cd6a4
improve polar-area sample
hamalaiv Feb 28, 2016
13fc892
improve scatter-multi-axis sample
hamalaiv Feb 28, 2016
a4fa956
improve scatter sample
hamalaiv Feb 28, 2016
2977c8e
improve doughnut sample
hamalaiv Feb 28, 2016
04fe614
fix title
hamalaiv Feb 28, 2016
33a1fa9
fix consistency with other samples
hamalaiv Feb 28, 2016
8d5b380
Fix global font settings
etimberg Feb 28, 2016
77971e6
Merge pull request #2072 from nnnick/fix/2050
etimberg Feb 28, 2016
aba16b4
Merge pull request #2069 from hamalaiv/fix/#2018
etimberg Feb 28, 2016
185ea39
Take padding into account when determining the model coordinates from…
etimberg Feb 28, 2016
237d5dc
Merge pull request #2073 from nnnick/fix/event-padding
etimberg Feb 28, 2016
156f8f0
Updated build files
etimberg Feb 28, 2016
3d6b47b
Fix legend generation when no datasets
etimberg Feb 28, 2016
a25c2c7
Merge pull request #2074 from nnnick/fix/2070
etimberg Feb 28, 2016
d5f8378
Fixes nnnick/Chart.js#2086 by introducing a new time.parser option wi…
Mar 2, 2016
b69b388
fixed travis built
Mar 2, 2016
fc46e25
fixed test and added a test for a custom date parser
Mar 2, 2016
9410eaa
fixed timezone bug in test
Mar 2, 2016
c99cf97
Merge pull request #2087 from MatthiasWinkelmann/time-parser-#2086
etimberg Mar 2, 2016
c3f7658
Fix some time rounding problems
etimberg Mar 6, 2016
a87ebe0
Fix test for time zone difference
etimberg Mar 6, 2016
a16093e
Merge pull request #2101 from nnnick/fix/2034
etimberg Mar 6, 2016
9bcc3ca
Allow ticks.fixedStepSize or ticks.stepSize options to mean the same …
etimberg Mar 6, 2016
5d2444a
Expose yAlign and xAlign as a tooltip option
100000001 Mar 10, 2016
136efea
Moved _model xAlign and yAlign setting to Positioning section and
100000001 Mar 10, 2016
1fbbdd2
Merge pull request #2116 from 100000001/v2.0-dev
etimberg Mar 10, 2016
72b0ef2
Missing whitespaces and code markup fixes
The-Smallest Mar 13, 2016
56611f5
Merge pull request #2125 from The-Smallest/docs-fixes
etimberg Mar 13, 2016
81e1448
Added 'borderSkipped' parameter to Rectangle.
The-Smallest Mar 13, 2016
f5bb8e2
Fixed bar.controller tests
The-Smallest Mar 13, 2016
4fec7df
Fix animation bug. Helpers.findNextWhere no longer returned the index…
etimberg Mar 13, 2016
f64324e
Merge pull request #2129 from nnnick/fix/2037
etimberg Mar 13, 2016
e511fc2
Merge pull request #2128 from The-Smallest/v2-rectangle-generic
etimberg Mar 13, 2016
fffbc27
Add composer.json
borancar Mar 14, 2016
bf724ab
Fix axis IDs in documentation
etimberg Mar 14, 2016
f09f32f
Merge pull request #2133 from borancar/v2.0-dev
etimberg Mar 14, 2016
1292558
Merge pull request #2132 from nnnick/fix/2131
etimberg Mar 14, 2016
04f1e57
Fix zoom reset
etimberg Mar 16, 2016
1157b19
Merge pull request #2139 from nnnick/fix/2104
etimberg Mar 16, 2016
21a33f0
Better conversion to ticks to make it easier to use callbacks
etimberg Mar 16, 2016
2ab86f5
Merge pull request #2144 from nnnick/fix/1942
etimberg Mar 16, 2016
998c693
Instead of showing a warning on load, throw an error on create if mom…
etimberg Mar 16, 2016
67bd2da
Merge pull request #2145 from nnnick/fix/2110
etimberg Mar 17, 2016
e090691
Better use of default scale types.
etimberg Mar 19, 2016
74fd697
Merge pull request #2155 from nnnick/fix/2154
etimberg Mar 19, 2016
9a0553a
Update built files
etimberg Mar 19, 2016
79f38b4
Fix scale merge when the xAxes object is specified but the type is not
etimberg Mar 20, 2016
f392619
Merge pull request #2157 from nnnick/fix/2156
etimberg Mar 20, 2016
f6cb3cf
Updated build
etimberg Mar 20, 2016
60a429f
Update doc version
etimberg Mar 23, 2016
798f643
Removed the default padding
niemyjski Mar 24, 2016
d4b6be5
Merge pull request #2173 from niemyjski/patch-1
tannerlinsley Mar 24, 2016
cefaef4
Fix tests
etimberg Mar 26, 2016
f39fa53
Fix doc titles
etimberg Mar 26, 2016
d834703
Better handling when data.datasets does not exist
etimberg Mar 30, 2016
37da19d
Merge pull request #2186 from nnnick/fix/2115
etimberg Mar 30, 2016
0b56ea4
Minor doc fixes
etimberg Apr 2, 2016
be6b254
Merge pull request #2203 from nnnick/fix/minor-doc-updates
etimberg Apr 2, 2016
b6d7ceb
Add initial implementation of constraint percentage width / height su…
etimberg Apr 2, 2016
b15b316
use watchify for incremental test rebuilds
etimberg Apr 2, 2016
3350d5f
Refactoring to reduce code size
etimberg Apr 2, 2016
5c1f242
Use latest firefox version
etimberg Apr 2, 2016
7875b0c
Install latest chrome before running tests
etimberg Apr 2, 2016
2b361e1
Fix typo
etimberg Apr 2, 2016
95bd0a5
Clip out the chart area so that things outside do not draw
etimberg Apr 3, 2016
9ee70d6
Category scale supports min / max
etimberg Apr 3, 2016
488826a
Update doc file to indicate that category scale supports min/max attr…
etimberg Apr 3, 2016
a7fede4
Fix jshint error
etimberg Apr 3, 2016
93a2e9f
Merge pull request #2209 from nnnick/zoom_and_pan_pre_work
etimberg Apr 3, 2016
d5fd737
Merge pull request #2206 from nnnick/fix/constraint-width-percent
etimberg Apr 3, 2016
6ba2efe
Built files
etimberg Apr 3, 2016
ebb8ca2
Bump version to v2.0.0
etimberg Apr 9, 2016
8c2bc34
Fix whitespace in Line Chart documentation
jamiepenney Apr 9, 2016
8fca954
Document the point radius setting
jamiepenney Apr 9, 2016
e93677e
Merge pull request #2233 from jamiepenney/v2.0-dev
etimberg Apr 9, 2016
68b4937
Don't measure undefined or null strings.
etimberg Apr 10, 2016
00004fd
Merge pull request #2234 from nnnick/fix/2223
etimberg Apr 10, 2016
5fa6003
fix "main" file path in bower.json
troywarr Apr 10, 2016
87c8f51
Merge pull request #2237 from troywarr/v2.0-dev
etimberg Apr 11, 2016
0c854dd
Allow gradients to be used as colors without causing errors when e.g.…
tomduncalf Apr 12, 2016
3166895
Merge pull request #2251 from tomduncalf/v2.0-handle-gradients
etimberg Apr 13, 2016
4b96572
Fixed legendCallback() html generation
dibsyjr1 Apr 13, 2016
5aa16a6
Fixed the generateLegend function
dibsyjr1 Apr 13, 2016
447801c
Returned Chart.js build file back to normal
dibsyjr1 Apr 13, 2016
1232a91
Merge pull request #2254 from dibsyjr1/v2.0-dev
etimberg Apr 13, 2016
e251d06
Using the dynamic absolute position of the canvas, even for relative …
HarvestingClouds Apr 15, 2016
ac4a4bf
Data Labels display for Line Bar combo for v2.0
thukaramvh Apr 15, 2016
fc74f98
Merge pull request #2263 from HarvestingClouds/patch-2
etimberg Apr 15, 2016
5836c19
Optimize animation frame requests (#2268)
simonbrunel Apr 16, 2016
0c32db7
try a different travis config
etimberg Apr 16, 2016
7bff338
Newer ubuntu version
etimberg Apr 16, 2016
72d03a0
Merge pull request #2270 from nnnick/fix/travis-tests
etimberg Apr 16, 2016
39cf4cc
Merge pull request #2264 from thukaramvh/tvenkat_bleeding_edge
etimberg Apr 16, 2016
d3a2996
Added rotation and circumference properties to doughnut/pie charts
mdehoog Apr 16, 2016
5e8bfea
Bump and build for 2.0.1
etimberg Apr 16, 2016
1be88df
Merge pull request #2271 from mdehoog/doughnut-rotation
etimberg Apr 16, 2016
4f60eec
Better default tick rotation and tick autoskip settings (#2258)
tannerlinsley Apr 16, 2016
6762506
2.0.2
tannerlinsley Apr 16, 2016
af1adf6
Merge branch 'master' into v2.0-dev
tannerlinsley Apr 16, 2016
241f085
Fix for doughnut rotation = 0, added unit test for doughnut rotation/…
mdehoog Apr 16, 2016
b50c281
Merge pull request #2273 from mdehoog/doughnut-rotation
etimberg Apr 16, 2016
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
7 changes: 5 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@

node_modules/*
custom/*
coverage/*

docs/index.md

.settings/
bower_components/

coverage/*

nbproject/*
22 changes: 20 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,31 @@
language: node_js
node_js:
- "0.11"
- "0.10"
- "5.6"
- "4.3"

before_install:
- "export CHROME_BIN=/usr/bin/google-chrome"
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"

before_script:
- npm install

script:
- gulp test
- gulp coverage
- cat ./coverage/lcov.info | ./node_modules/.bin/coveralls

notifications:
slack: chartjs:pcfCZR6ugg5TEcaLtmIfQYuA

sudo: required
dist: trusty

addons:
firefox: latest
apt:
sources:
- google-chrome
packages:
- google-chrome-stable
6 changes: 6 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ Guidlines for reporting bugs:
Please provide any additional details associated with the bug, if it's browser or screen density specific, or only happens with a certain configuration or data.


Local development
-----------------

Run `npm install` to install all the libraries, then run `gulp dev --test` to build and run tests as you make changes.


Pull requests
-------------

Expand Down
Loading