]> git.ipfire.org Git - thirdparty/Chart.js.git/log
thirdparty/Chart.js.git
9 years agoAdded rotation and circumference properties to doughnut/pie charts 2271/head
Michael de Hoog [Sat, 16 Apr 2016 14:23:48 +0000 (00:23 +1000)] 
Added rotation and circumference properties to doughnut/pie charts

9 years agoMerge pull request #2264 from thukaramvh/tvenkat_bleeding_edge
Evert Timberg [Sat, 16 Apr 2016 12:44:19 +0000 (08:44 -0400)] 
Merge pull request #2264 from thukaramvh/tvenkat_bleeding_edge

Graph Index Data Labels display for Line Bar Graph for v2.0

9 years agoMerge pull request #2270 from nnnick/fix/travis-tests
Evert Timberg [Sat, 16 Apr 2016 12:42:49 +0000 (08:42 -0400)] 
Merge pull request #2270 from nnnick/fix/travis-tests

Fix/travis tests

9 years agoNewer ubuntu version 2270/head
Evert Timberg [Sat, 16 Apr 2016 12:28:33 +0000 (08:28 -0400)] 
Newer ubuntu version

9 years agotry a different travis config
Evert Timberg [Sat, 16 Apr 2016 12:24:18 +0000 (08:24 -0400)] 
try a different travis config

9 years agoOptimize animation frame requests (#2268)
Simon Brunel [Sat, 16 Apr 2016 00:15:54 +0000 (02:15 +0200)] 
Optimize animation frame requests (#2268)

The animation service now keeps track of the active animation frame request and will skip new requests until the current one is executed. This can happen when processing mouse events, e.g. 'mousemove' and 'mouseout' events will trigger multiple renders.

9 years agoMerge pull request #2263 from HarvestingClouds/patch-2
Evert Timberg [Fri, 15 Apr 2016 10:13:43 +0000 (06:13 -0400)] 
Merge pull request #2263 from HarvestingClouds/patch-2

Using the dynamic absolute position of the canvas, even for relative …

9 years agoData Labels display for Line Bar combo for v2.0 2264/head
Thukaram V H [Fri, 15 Apr 2016 04:57:58 +0000 (21:57 -0700)] 
Data Labels display for Line Bar combo for v2.0

Data Labels display for Line Bar combo for v2.0

9 years agoUsing the dynamic absolute position of the canvas, even for relative placement of... 2263/head
Aman Sharma [Fri, 15 Apr 2016 04:11:09 +0000 (00:11 -0400)] 
Using the dynamic absolute position of the canvas, even for relative placement of the chart

This will work with both relative and absolute position for the chart and will apply the tooltips appropriately. I have tested in a normal context and then also using the chart in the second column of two column table i.e. in a different position on the screen. Without this, the default tooltips will appear at the same position no matter where the chart is placed. They will appear misplaced. The fix I have provided allows the tooltips to appear smoothly with the chart, no matter where it is placed on the web page.

9 years agoMerge pull request #2254 from dibsyjr1/v2.0-dev
Evert Timberg [Wed, 13 Apr 2016 19:27:04 +0000 (15:27 -0400)] 
Merge pull request #2254 from dibsyjr1/v2.0-dev

Fixed legendCallback() html generation

9 years agoReturned Chart.js build file back to normal 2254/head
dibsyjr1 [Wed, 13 Apr 2016 17:51:32 +0000 (18:51 +0100)] 
Returned Chart.js build file back to normal

9 years agoFixed the generateLegend function
dibsyjr1 [Wed, 13 Apr 2016 15:03:08 +0000 (16:03 +0100)] 
Fixed the generateLegend function

Fixed the generateLegend function to create the colour block next to the text instead of around it.

9 years agoFixed legendCallback() html generation
dibsyjr1 [Wed, 13 Apr 2016 14:26:03 +0000 (15:26 +0100)] 
Fixed legendCallback() html generation

Fixed legendCallback's html generation so that the span lies next to the text instead of being around it.

9 years agoMerge pull request #2251 from tomduncalf/v2.0-handle-gradients
Evert Timberg [Wed, 13 Apr 2016 11:05:19 +0000 (07:05 -0400)] 
Merge pull request #2251 from tomduncalf/v2.0-handle-gradients

Allow gradients to be used as colors without causing errors when e.g. calling the color helper to generate the default colour value for hover

9 years agoAllow gradients to be used as colors without causing errors when e.g. calling the... 2251/head
Tom Duncalf [Tue, 12 Apr 2016 15:36:56 +0000 (16:36 +0100)] 
Allow gradients to be used as colors without causing errors when e.g. calling the color helper to generate the defualt colour value for hover

9 years agoMerge pull request #2237 from troywarr/v2.0-dev
Evert Timberg [Mon, 11 Apr 2016 00:15:34 +0000 (20:15 -0400)] 
Merge pull request #2237 from troywarr/v2.0-dev

Fix "main" file path in bower.json

9 years agofix "main" file path in bower.json 2237/head
Troy Warr [Sun, 10 Apr 2016 23:59:03 +0000 (18:59 -0500)] 
fix "main" file path in bower.json

9 years agoMerge pull request #2234 from nnnick/fix/2223
Evert Timberg [Sun, 10 Apr 2016 14:15:52 +0000 (10:15 -0400)] 
Merge pull request #2234 from nnnick/fix/2223

Don't measure undefined or null strings.

9 years agoDon't measure undefined or null strings. 2234/head
Evert Timberg [Sun, 10 Apr 2016 14:10:31 +0000 (10:10 -0400)] 
Don't measure undefined or null strings.

9 years agoMerge pull request #2233 from jamiepenney/v2.0-dev
Evert Timberg [Sat, 9 Apr 2016 23:33:10 +0000 (19:33 -0400)] 
Merge pull request #2233 from jamiepenney/v2.0-dev

Update Line chart documentation

9 years agoDocument the point radius setting 2233/head
Jamie Penney [Sat, 9 Apr 2016 23:15:55 +0000 (11:15 +1200)] 
Document the point radius setting

9 years agoFix whitespace in Line Chart documentation
Jamie Penney [Sat, 9 Apr 2016 23:04:23 +0000 (11:04 +1200)] 
Fix whitespace in Line Chart documentation

9 years agoBump version to v2.0.0 v2.0.0
etimberg [Sat, 9 Apr 2016 12:01:01 +0000 (08:01 -0400)] 
Bump version to v2.0.0

9 years agoBuilt files
Evert Timberg [Sun, 3 Apr 2016 17:23:09 +0000 (13:23 -0400)] 
Built files

9 years agoMerge pull request #2206 from nnnick/fix/constraint-width-percent
Evert Timberg [Sun, 3 Apr 2016 17:18:06 +0000 (13:18 -0400)] 
Merge pull request #2206 from nnnick/fix/constraint-width-percent

Allow percentages as the max-width/max-height of the container

9 years agoMerge pull request #2209 from nnnick/zoom_and_pan_pre_work
Evert Timberg [Sun, 3 Apr 2016 13:19:19 +0000 (09:19 -0400)] 
Merge pull request #2209 from nnnick/zoom_and_pan_pre_work

Zoom and pan pre work

9 years agoFix jshint error 2209/head
Evert Timberg [Sun, 3 Apr 2016 13:15:11 +0000 (09:15 -0400)] 
Fix jshint error

9 years agoUpdate doc file to indicate that category scale supports min/max attributes
Evert Timberg [Sun, 3 Apr 2016 03:07:41 +0000 (23:07 -0400)] 
Update doc file to indicate that category scale supports min/max attributes

9 years agoCategory scale supports min / max
Evert Timberg [Sun, 3 Apr 2016 03:05:48 +0000 (23:05 -0400)] 
Category scale supports min / max

9 years agoClip out the chart area so that things outside do not draw
Evert Timberg [Sun, 3 Apr 2016 01:41:57 +0000 (21:41 -0400)] 
Clip out the chart area so that things outside do not draw

9 years agoFix typo 2206/head
Evert Timberg [Sat, 2 Apr 2016 13:41:18 +0000 (09:41 -0400)] 
Fix typo

9 years agoInstall latest chrome before running tests
Evert Timberg [Sat, 2 Apr 2016 13:37:20 +0000 (09:37 -0400)] 
Install latest chrome before running tests

9 years agoUse latest firefox version
Evert Timberg [Sat, 2 Apr 2016 13:37:07 +0000 (09:37 -0400)] 
Use latest firefox version

9 years agoRefactoring to reduce code size
Evert Timberg [Sat, 2 Apr 2016 13:19:33 +0000 (09:19 -0400)] 
Refactoring to reduce code size

9 years agouse watchify for incremental test rebuilds
Evert Timberg [Sat, 2 Apr 2016 13:02:38 +0000 (09:02 -0400)] 
use watchify for incremental test rebuilds

9 years agoAdd initial implementation of constraint percentage width / height support. Added...
Evert Timberg [Sat, 2 Apr 2016 03:11:01 +0000 (23:11 -0400)] 
Add initial implementation of constraint percentage width / height support. Added tests for dom sizing methods.

9 years agoMerge pull request #2203 from nnnick/fix/minor-doc-updates
Evert Timberg [Sat, 2 Apr 2016 02:16:05 +0000 (22:16 -0400)] 
Merge pull request #2203 from nnnick/fix/minor-doc-updates

Minor doc fixes

9 years agoMinor doc fixes 2203/head
Evert Timberg [Sat, 2 Apr 2016 02:12:37 +0000 (22:12 -0400)] 
Minor doc fixes

9 years agoMerge pull request #2186 from nnnick/fix/2115
Evert Timberg [Wed, 30 Mar 2016 00:13:42 +0000 (20:13 -0400)] 
Merge pull request #2186 from nnnick/fix/2115

Better handling when data.datasets does not exist

9 years agoBetter handling when data.datasets does not exist 2186/head
etimberg [Wed, 30 Mar 2016 00:10:29 +0000 (20:10 -0400)] 
Better handling when data.datasets does not exist

9 years agoFix doc titles
Evert Timberg [Sat, 26 Mar 2016 14:57:43 +0000 (10:57 -0400)] 
Fix doc titles

9 years agoFix tests
Evert Timberg [Sat, 26 Mar 2016 14:49:02 +0000 (10:49 -0400)] 
Fix tests

9 years agoMerge pull request #2173 from niemyjski/patch-1
Tanner Linsley [Thu, 24 Mar 2016 19:08:24 +0000 (14:08 -0500)] 
Merge pull request #2173 from niemyjski/patch-1

Removed the default padding

9 years agoRemoved the default padding 2173/head
Blake Niemyjski [Thu, 24 Mar 2016 19:07:35 +0000 (14:07 -0500)] 
Removed the default padding

You should put a style on the container element

9 years agoUpdate doc version
etimberg [Wed, 23 Mar 2016 23:22:43 +0000 (19:22 -0400)] 
Update doc version

9 years agoUpdated build
etimberg [Sun, 20 Mar 2016 15:17:49 +0000 (11:17 -0400)] 
Updated build

9 years agoMerge pull request #2157 from nnnick/fix/2156
Evert Timberg [Sun, 20 Mar 2016 15:15:41 +0000 (11:15 -0400)] 
Merge pull request #2157 from nnnick/fix/2156

Fix scale merge when the xAxes object is specified but the type is not

9 years agoFix scale merge when the xAxes object is specified but the type is not 2157/head
etimberg [Sun, 20 Mar 2016 15:12:26 +0000 (11:12 -0400)] 
Fix scale merge when the xAxes object is specified but the type is not

9 years agoUpdate built files
Evert Timberg [Sat, 19 Mar 2016 13:16:44 +0000 (09:16 -0400)] 
Update built files

9 years agoMerge pull request #2155 from nnnick/fix/2154
Evert Timberg [Sat, 19 Mar 2016 13:03:49 +0000 (09:03 -0400)] 
Merge pull request #2155 from nnnick/fix/2154

Better use of default scale types.

9 years agoBetter use of default scale types. 2155/head
Evert Timberg [Sat, 19 Mar 2016 12:50:50 +0000 (08:50 -0400)] 
Better use of default scale types.

9 years agoMerge pull request #2145 from nnnick/fix/2110 2148/head
Evert Timberg [Thu, 17 Mar 2016 00:08:15 +0000 (20:08 -0400)] 
Merge pull request #2145 from nnnick/fix/2110

Instead of showing a warning on load, throw an error on create if moment is not defined.

9 years agoInstead of showing a warning on load, throw an error on create if moment is not defined. 2145/head
etimberg [Wed, 16 Mar 2016 23:59:20 +0000 (19:59 -0400)] 
Instead of showing a warning on load, throw an error on create if moment is not defined.

9 years agoMerge pull request #2144 from nnnick/fix/1942
Evert Timberg [Wed, 16 Mar 2016 23:44:10 +0000 (19:44 -0400)] 
Merge pull request #2144 from nnnick/fix/1942

Better conversion to ticks to make it easier to use callbacks

9 years agoBetter conversion to ticks to make it easier to use callbacks 2144/head
etimberg [Wed, 16 Mar 2016 23:39:09 +0000 (19:39 -0400)] 
Better conversion to ticks to make it easier to use callbacks

9 years agoMerge pull request #2139 from nnnick/fix/2104
Evert Timberg [Wed, 16 Mar 2016 00:09:51 +0000 (20:09 -0400)] 
Merge pull request #2139 from nnnick/fix/2104

Fix zoom reset

9 years agoFix zoom reset 2139/head
Evert Timberg [Wed, 16 Mar 2016 00:03:28 +0000 (20:03 -0400)] 
Fix zoom reset

9 years agoMerge pull request #2132 from nnnick/fix/2131
Evert Timberg [Mon, 14 Mar 2016 23:51:09 +0000 (19:51 -0400)] 
Merge pull request #2132 from nnnick/fix/2131

Fix axis IDs in documentation

9 years agoMerge pull request #2133 from borancar/v2.0-dev
Evert Timberg [Mon, 14 Mar 2016 23:49:36 +0000 (19:49 -0400)] 
Merge pull request #2133 from borancar/v2.0-dev

Add composer.json

9 years agoFix axis IDs in documentation 2132/head
Evert Timberg [Mon, 14 Mar 2016 23:43:21 +0000 (19:43 -0400)] 
Fix axis IDs in documentation

9 years agoAdd composer.json 2133/head
Boran Car [Mon, 14 Mar 2016 23:41:04 +0000 (23:41 +0000)] 
Add composer.json

9 years agoMerge pull request #2128 from The-Smallest/v2-rectangle-generic
Evert Timberg [Sun, 13 Mar 2016 18:06:31 +0000 (14:06 -0400)] 
Merge pull request #2128 from The-Smallest/v2-rectangle-generic

Generic Rectangle: any border (botton, left, top, right) can be skipped now.

9 years agoMerge pull request #2129 from nnnick/fix/2037
Evert Timberg [Sun, 13 Mar 2016 16:29:48 +0000 (12:29 -0400)] 
Merge pull request #2129 from nnnick/fix/2037

Fix animation bug.

9 years agoFix animation bug. Helpers.findNextWhere no longer returned the index of the item... 2129/head
Evert Timberg [Sun, 13 Mar 2016 16:24:33 +0000 (12:24 -0400)] 
Fix animation bug. Helpers.findNextWhere no longer returned the index of the item. This causes the wrong animation object to be removed.

9 years agoFixed bar.controller tests 2128/head
Ivan Samoylenko [Sun, 13 Mar 2016 16:10:49 +0000 (19:10 +0300)] 
Fixed bar.controller tests

9 years agoAdded 'borderSkipped' parameter to Rectangle.
Ivan Samoylenko [Sun, 13 Mar 2016 15:58:36 +0000 (18:58 +0300)] 
Added 'borderSkipped' parameter to Rectangle.

9 years agoMerge pull request #2125 from The-Smallest/docs-fixes
Evert Timberg [Sun, 13 Mar 2016 13:30:14 +0000 (09:30 -0400)] 
Merge pull request #2125 from The-Smallest/docs-fixes

Missing whitespaces and code markup fixes

9 years agoMissing whitespaces and code markup fixes 2125/head
Ivan Samoylenko [Sun, 13 Mar 2016 11:47:37 +0000 (14:47 +0300)] 
Missing whitespaces and code markup fixes

9 years agoMerge pull request #2116 from 100000001/v2.0-dev 2103/head
Evert Timberg [Thu, 10 Mar 2016 12:06:19 +0000 (07:06 -0500)] 
Merge pull request #2116 from 100000001/v2.0-dev

Expose yAlign and xAlign as a tooltip option

9 years agoMoved _model xAlign and yAlign setting to Positioning section and 2116/head
100000001 [Thu, 10 Mar 2016 08:05:59 +0000 (09:05 +0100)] 
Moved _model xAlign and yAlign setting to Positioning section and
swapped y and x

9 years agoExpose yAlign and xAlign as a tooltip option
100000001 [Thu, 10 Mar 2016 08:00:26 +0000 (09:00 +0100)] 
Expose yAlign and xAlign as a tooltip option

9 years agoAllow ticks.fixedStepSize or ticks.stepSize options to mean the same thing
Evert Timberg [Sun, 6 Mar 2016 13:56:31 +0000 (08:56 -0500)] 
Allow ticks.fixedStepSize or ticks.stepSize options to mean the same thing

9 years agoMerge pull request #2101 from nnnick/fix/2034
Evert Timberg [Sun, 6 Mar 2016 04:18:54 +0000 (23:18 -0500)] 
Merge pull request #2101 from nnnick/fix/2034

Fix some time rounding problems

9 years agoFix test for time zone difference 2101/head
Evert Timberg [Sun, 6 Mar 2016 04:16:25 +0000 (23:16 -0500)] 
Fix test for time zone difference

9 years agoFix some time rounding problems
Evert Timberg [Sun, 6 Mar 2016 03:58:34 +0000 (22:58 -0500)] 
Fix some time rounding problems

9 years agoMerge pull request #2087 from MatthiasWinkelmann/time-parser-#2086
Evert Timberg [Wed, 2 Mar 2016 16:40:37 +0000 (11:40 -0500)] 
Merge pull request #2087 from MatthiasWinkelmann/time-parser-#2086

A fix for nnnick/Chart.js#2086

9 years agofixed timezone bug in test 2087/head
Matthias Winkelmann [Wed, 2 Mar 2016 15:51:48 +0000 (16:51 +0100)] 
fixed timezone bug in test

9 years agofixed test and added a test for a custom date parser
Matthias Winkelmann [Wed, 2 Mar 2016 15:40:58 +0000 (16:40 +0100)] 
fixed test and added a test for a custom date parser

9 years agofixed travis built
Matthias Winkelmann [Wed, 2 Mar 2016 13:16:52 +0000 (14:16 +0100)] 
fixed travis built

9 years agoFixes nnnick/Chart.js#2086 by introducing a new time.parser option with high priority...
Matthias Winkelmann [Wed, 2 Mar 2016 12:53:35 +0000 (13:53 +0100)] 
Fixes nnnick/Chart.js#2086 by introducing a new time.parser option with high priority to replace the (deprecated) time.format

9 years agoMerge pull request #2074 from nnnick/fix/2070
Evert Timberg [Sun, 28 Feb 2016 22:56:11 +0000 (17:56 -0500)] 
Merge pull request #2074 from nnnick/fix/2070

Fix legend generation when no datasets

9 years agoFix legend generation when no datasets 2074/head
Evert Timberg [Sun, 28 Feb 2016 22:51:06 +0000 (17:51 -0500)] 
Fix legend generation when no datasets

9 years agoUpdated build files
Evert Timberg [Sun, 28 Feb 2016 20:55:05 +0000 (15:55 -0500)] 
Updated build files

9 years agoMerge pull request #2073 from nnnick/fix/event-padding
Evert Timberg [Sun, 28 Feb 2016 20:44:30 +0000 (15:44 -0500)] 
Merge pull request #2073 from nnnick/fix/event-padding

Take padding into account when determining the model coordinates from event coordinates

9 years agoTake padding into account when determining the model coordinates from event coordinates 2073/head
Evert Timberg [Sun, 28 Feb 2016 20:32:15 +0000 (15:32 -0500)] 
Take padding into account when determining the model coordinates from event coordinates

9 years agoMerge pull request #2069 from hamalaiv/fix/#2018
Evert Timberg [Sun, 28 Feb 2016 19:26:51 +0000 (14:26 -0500)] 
Merge pull request #2069 from hamalaiv/fix/#2018

Fix/#2018

9 years agoMerge pull request #2072 from nnnick/fix/2050
Evert Timberg [Sun, 28 Feb 2016 18:44:42 +0000 (13:44 -0500)] 
Merge pull request #2072 from nnnick/fix/2050

Fix global font settings

9 years agoFix global font settings 2072/head
Evert Timberg [Sun, 28 Feb 2016 18:41:17 +0000 (13:41 -0500)] 
Fix global font settings

9 years agofix consistency with other samples 2069/head
Ville Hämäläinen [Sun, 28 Feb 2016 08:20:10 +0000 (10:20 +0200)] 
fix consistency with other samples

9 years agofix title
Ville Hämäläinen [Sun, 28 Feb 2016 08:16:09 +0000 (10:16 +0200)] 
fix title

9 years agoimprove doughnut sample
Ville Hämäläinen [Sun, 28 Feb 2016 08:15:18 +0000 (10:15 +0200)] 
improve doughnut sample

- set title
- set same size canvas as other samples
- remove user select from canvas
- remove html legend
- remove logs

9 years agoimprove scatter sample
Ville Hämäläinen [Sun, 28 Feb 2016 08:10:45 +0000 (10:10 +0200)] 
improve scatter sample

- set title
- set same size canvas as other samples
- remove user select from canvas

9 years agoimprove scatter-multi-axis sample
Ville Hämäläinen [Sun, 28 Feb 2016 08:09:14 +0000 (10:09 +0200)] 
improve scatter-multi-axis sample

- set title
- set same size canvas as other samples
- remove user select from canvas

9 years agoimprove polar-area sample
Ville Hämäläinen [Sun, 28 Feb 2016 08:05:31 +0000 (10:05 +0200)] 
improve polar-area sample

- set title
- set same size canvas as other samples
- remove user select from canvas

9 years agoimprove polar-area sample
Ville Hämäläinen [Sun, 28 Feb 2016 08:03:43 +0000 (10:03 +0200)] 
improve polar-area sample

- set title
- set same size canvas as other samples
- remove user select from canvas

9 years agoimprove combo-bar-line sample
Ville Hämäläinen [Sun, 28 Feb 2016 08:01:34 +0000 (10:01 +0200)] 
improve combo-bar-line sample

- set title
- set same size canvas as other samples
- remove user select from canvas

9 years agoimprove bar sample
Ville Hämäläinen [Sun, 28 Feb 2016 08:00:01 +0000 (10:00 +0200)] 
improve bar sample

- set title
- set same size canvas as other samples
- remove user select from canvas
- remove html legend
- fix x-axis labels when adding data

9 years agoimprove bar-stacked sample
Ville Hämäläinen [Sun, 28 Feb 2016 07:55:28 +0000 (09:55 +0200)] 
improve bar-stacked sample

- set title
- set same size canvas as other samples
- remove user select from canvas

9 years agoimprove bar-multi-axis sample
Ville Hämäläinen [Sun, 28 Feb 2016 07:54:16 +0000 (09:54 +0200)] 
improve bar-multi-axis sample

- set title
- set same size canvas as other samples
- remove user select from canvas

9 years agofix titles
Ville Hämäläinen [Sun, 28 Feb 2016 07:50:45 +0000 (09:50 +0200)] 
fix titles