]> git.ipfire.org Git - thirdparty/Chart.js.git/log
thirdparty/Chart.js.git
9 years agoAdds the ability to draw custom point styles 2031/head
Mathias Küsel [Sun, 7 Feb 2016 03:55:42 +0000 (04:55 +0100)] 
Adds the ability to draw custom point styles

9 years agoMerge pull request #2027 from nnnick/fix-stacking-order-and-reversable-legend
Tanner Linsley [Wed, 17 Feb 2016 20:11:40 +0000 (13:11 -0700)] 
Merge pull request #2027 from nnnick/fix-stacking-order-and-reversable-legend

Fix stacking, tooltip, and legend order for stackables

9 years agoTooltips now respect stacked ordering 2027/head
Tanner Linsley [Wed, 17 Feb 2016 19:42:29 +0000 (12:42 -0700)] 
Tooltips now respect stacked ordering

Tooltips detect the stacked scale property now, reversing when
appropriate

9 years agoReversible Legends
Tanner Linsley [Wed, 17 Feb 2016 19:42:09 +0000 (12:42 -0700)] 
Reversible Legends

Legends can now be reversed with the `reversed: true` property.

9 years agoProper line and bar stacking order
Tanner Linsley [Wed, 17 Feb 2016 19:41:32 +0000 (12:41 -0700)] 
Proper line and bar stacking order

Stacked line and bar charts now behave predictably with the first
dataset on the bottom stacked upwards.

9 years agoUpdated build
Evert Timberg [Mon, 15 Feb 2016 15:52:51 +0000 (10:52 -0500)] 
Updated build

9 years agoMerge pull request #2017 from nnnick/fix/1884
Evert Timberg [Mon, 15 Feb 2016 15:49:59 +0000 (10:49 -0500)] 
Merge pull request #2017 from nnnick/fix/1884

When the last label would overlap with the previously shown label, skip the previously shown one

9 years agoWhen the last label would overlap with the previously shown label, skip the previousl... 2017/head
Evert Timberg [Mon, 15 Feb 2016 15:43:19 +0000 (10:43 -0500)] 
When the last label would overlap with the previously shown label, skip the previously shown one

9 years agoMerge pull request #2015 from nnnick/fix/1962
Evert Timberg [Mon, 15 Feb 2016 14:44:53 +0000 (09:44 -0500)] 
Merge pull request #2015 from nnnick/fix/1962

Disable autoskipper for time scales

9 years agoDisable autoskipper for time scales 2015/head
Evert Timberg [Mon, 15 Feb 2016 14:41:35 +0000 (09:41 -0500)] 
Disable autoskipper for time scales

9 years agoLegend tests + fix minor bug where padding was not taken into account when going...
Evert Timberg [Mon, 15 Feb 2016 14:23:31 +0000 (09:23 -0500)] 
Legend tests + fix minor bug where padding was not taken into account when going down to the next line

9 years agoTitle block tests
Evert Timberg [Sun, 14 Feb 2016 23:04:12 +0000 (18:04 -0500)] 
Title block tests

9 years agoClean up code climate style issues and formatting.
etimberg [Sun, 14 Feb 2016 22:06:00 +0000 (17:06 -0500)] 
Clean up code climate style issues and formatting.

9 years agoMerge pull request #2014 from nnnick/update-code-climate-config
Evert Timberg [Sun, 14 Feb 2016 20:12:55 +0000 (15:12 -0500)] 
Merge pull request #2014 from nnnick/update-code-climate-config

Update code climate config

9 years agoadd some more reporters 2014/head
etimberg [Sun, 14 Feb 2016 19:43:02 +0000 (14:43 -0500)] 
add some more reporters

9 years agoupdates from running code climate locally
etimberg [Sun, 14 Feb 2016 18:25:37 +0000 (13:25 -0500)] 
updates from running code climate locally

9 years agoimprove syntax
Evert Timberg [Sun, 14 Feb 2016 16:05:33 +0000 (11:05 -0500)] 
improve syntax

9 years agotry and make this work
Evert Timberg [Sun, 14 Feb 2016 15:31:31 +0000 (10:31 -0500)] 
try and make this work

9 years agoexplicitly run certain engines
Evert Timberg [Sun, 14 Feb 2016 15:24:17 +0000 (10:24 -0500)] 
explicitly run certain engines

9 years agoAdd codeclimate config
Evert Timberg [Sun, 14 Feb 2016 15:08:00 +0000 (10:08 -0500)] 
Add codeclimate config

9 years agofix typo in readme
Evert Timberg [Sun, 14 Feb 2016 15:03:37 +0000 (10:03 -0500)] 
fix typo in readme

9 years agoMerge pull request #2013 from nnnick/fix-coverage-report
Evert Timberg [Sun, 14 Feb 2016 14:59:37 +0000 (09:59 -0500)] 
Merge pull request #2013 from nnnick/fix-coverage-report

Fix coverage report

9 years agoRun coverage properly on the CI 2013/head
Evert Timberg [Sun, 14 Feb 2016 14:48:24 +0000 (09:48 -0500)] 
Run coverage properly on the CI

9 years agoUse coveralls to report lines of coverage and add a badge to the readme
Evert Timberg [Sun, 14 Feb 2016 14:38:26 +0000 (09:38 -0500)] 
Use coveralls to report lines of coverage and add a badge to the readme

9 years agouse a new node version
Evert Timberg [Sun, 14 Feb 2016 14:38:02 +0000 (09:38 -0500)] 
use a new node version

9 years agocoverage report works
etimberg [Sun, 14 Feb 2016 03:44:55 +0000 (22:44 -0500)] 
coverage report works

9 years agoUpdate other test tasks to use karma-browserify
etimberg [Sun, 14 Feb 2016 02:58:49 +0000 (21:58 -0500)] 
Update other test tasks to use karma-browserify

9 years agobegin fixing coverage tests
etimberg [Sun, 14 Feb 2016 02:50:12 +0000 (21:50 -0500)] 
begin fixing coverage tests

9 years agoImprove joshing reporting. Added a JSHint config file.
etimberg [Sun, 14 Feb 2016 01:12:26 +0000 (20:12 -0500)] 
Improve joshing reporting. Added a JSHint config file.

Fixed JSHint warnings.

9 years agoMerge pull request #2007 from nnnick/browserify-build-system
Tanner Linsley [Sat, 13 Feb 2016 16:25:23 +0000 (09:25 -0700)] 
Merge pull request #2007 from nnnick/browserify-build-system

Browserify build system

9 years agoDocumentation Updates for UMD support 2007/head
Tanner Linsley [Sat, 13 Feb 2016 06:03:44 +0000 (23:03 -0700)] 
Documentation Updates for UMD support

9 years agoBuilt Files
Tanner Linsley [Fri, 12 Feb 2016 06:45:30 +0000 (23:45 -0700)] 
Built Files

9 years agoUpdated Samples
Tanner Linsley [Fri, 12 Feb 2016 06:45:25 +0000 (23:45 -0700)] 
Updated Samples

9 years agoCore helpers reference
Tanner Linsley [Fri, 12 Feb 2016 06:45:14 +0000 (23:45 -0700)] 
Core helpers reference

9 years agoTesting for the new build system
Tanner Linsley [Fri, 12 Feb 2016 06:25:06 +0000 (23:25 -0700)] 
Testing for the new build system

9 years agoPassing All Tests, Updated Dependencies
Tanner Linsley [Fri, 12 Feb 2016 06:16:43 +0000 (23:16 -0700)] 
Passing All Tests, Updated Dependencies

9 years agoBundled builds
Tanner Linsley [Fri, 12 Feb 2016 04:29:26 +0000 (21:29 -0700)] 
Bundled builds

Possible usages are:

src/Chart.js (umd)
dist/Chart.js (ChartJS)
dist/Chart.min.js (ChartJS minified)
dist/Chart.bundle.js (ChartJS with Moment.js)
dist/Chart.bundle.min.js (ChartJS with Moment.js minified)

9 years agoBrowserify for easier UMD consumptions and vanilla builds
Tanner Linsley [Fri, 12 Feb 2016 03:30:53 +0000 (20:30 -0700)] 
Browserify for easier UMD consumptions and vanilla builds

9 years agoMerge branch 'v2.0-dev' into fix-legend-tooltip-stacked-ordering
Tanner Linsley [Wed, 10 Feb 2016 19:15:40 +0000 (12:15 -0700)] 
Merge branch 'v2.0-dev' into fix-legend-tooltip-stacked-ordering

9 years agoMerge pull request #1978 from roben/v2.0-dev
Evert Timberg [Tue, 9 Feb 2016 12:29:40 +0000 (07:29 -0500)] 
Merge pull request #1978 from roben/v2.0-dev

Fix tooltip error and add fixed steps to linear scale

9 years agoUpdated build and documentation 1978/head
Robert Becker [Tue, 9 Feb 2016 12:04:07 +0000 (13:04 +0100)] 
Updated build and documentation

9 years agoMerged remote-tracking branch 'upstream/v2.0-dev' into v2.0-dev to fix conflicts.
Robert Becker [Tue, 9 Feb 2016 11:54:53 +0000 (12:54 +0100)] 
Merged remote-tracking branch 'upstream/v2.0-dev' into v2.0-dev to fix conflicts.
Refactored linear scale fixed step size implementation.
Added nbproject to .gitignore

9 years agoMerge pull request #1986 from nnnick/fix/1292
Evert Timberg [Mon, 8 Feb 2016 01:09:18 +0000 (20:09 -0500)] 
Merge pull request #1986 from nnnick/fix/1292

Update bar sample file to use elements config. Fixes #1292

9 years agoUpdate bar sample file to use elements config. Fixes #1292 1986/head
etimberg [Mon, 8 Feb 2016 01:06:50 +0000 (20:06 -0500)] 
Update bar sample file to use elements config. Fixes #1292

9 years agoMerge pull request #1985 from nnnick/fix/1144
Evert Timberg [Mon, 8 Feb 2016 01:01:01 +0000 (20:01 -0500)] 
Merge pull request #1985 from nnnick/fix/1144

Update docs for #1144

9 years agoUpdate docs for #1144 1985/head
etimberg [Mon, 8 Feb 2016 00:55:32 +0000 (19:55 -0500)] 
Update docs for #1144

9 years agoAdd docs for global font options
etimberg [Mon, 8 Feb 2016 00:48:39 +0000 (19:48 -0500)] 
Add docs for global font options

9 years agoMerge pull request #1984 from nnnick/fix/1890
Evert Timberg [Sat, 6 Feb 2016 14:41:34 +0000 (09:41 -0500)] 
Merge pull request #1984 from nnnick/fix/1890

Write an almost equals function and use it in the linear scale. …

9 years agoWrite an almost equals function and use it in the linear scale. Added a test for... 1984/head
Evert Timberg [Sat, 6 Feb 2016 14:38:44 +0000 (09:38 -0500)] 
Write an almost equals function and use it in the linear scale. Added a test for this new function.

9 years agoRemoved nbproject folder
Robert Becker [Fri, 5 Feb 2016 13:36:37 +0000 (14:36 +0100)] 
Removed nbproject folder

9 years agoChart.js was missing?
Robert Becker [Fri, 5 Feb 2016 09:11:58 +0000 (10:11 +0100)] 
Chart.js was missing?

9 years agoFixed tab sizing in core.helpers.js
Robert Becker [Fri, 5 Feb 2016 08:43:20 +0000 (09:43 +0100)] 
Fixed tab sizing in core.helpers.js

9 years agoFurther reformatted scale.linear.js to match original indenting.
Robert Becker [Fri, 5 Feb 2016 08:41:45 +0000 (09:41 +0100)] 
Further reformatted scale.linear.js to match original indenting.
Refactored and fixed scale calculation.
Added dist files to commit.

9 years agoFurther reformatted scale.linear.js to match original indenting.
Robert Becker [Fri, 5 Feb 2016 08:33:57 +0000 (09:33 +0100)] 
Further reformatted scale.linear.js to match original indenting.

9 years agoAdded documentation for fixedStepSize.
Robert Becker [Fri, 5 Feb 2016 08:28:50 +0000 (09:28 +0100)] 
Added documentation for fixedStepSize.
Reformatted scale.linear.js to match original indenting.

9 years agoRemoved debug log.
Robert Becker [Thu, 4 Feb 2016 14:28:06 +0000 (15:28 +0100)] 
Removed debug log.

9 years agoFixed typo in core.helpers.js.
Robert Becker [Thu, 4 Feb 2016 14:20:17 +0000 (15:20 +0100)] 
Fixed typo in core.helpers.js.
Added ticks.fixedStepSize configuration parameter to force linear scale steps.

9 years agoMerge branch 'v2.0-dev' of github.com:roben/Chart.js into v2.0-dev
Robert Becker [Thu, 4 Feb 2016 09:38:35 +0000 (10:38 +0100)] 
Merge branch 'v2.0-dev' of github.com:roben/Chart.js into v2.0-dev

# Conflicts:
# src/core/core.helpers.js

9 years agoFixed label callbacks adding only a single line instead of multiple lines as stated...
Robert Becker [Thu, 4 Feb 2016 09:34:29 +0000 (10:34 +0100)] 
Fixed label callbacks adding only a single line instead of multiple lines as stated in docs.

9 years agoFixed label callbacks adding only a single line instead of multiple lines as stated...
Robert Becker [Thu, 4 Feb 2016 09:34:29 +0000 (10:34 +0100)] 
Fixed label callbacks adding only a single line instead of multiple lines as stated in docs.

9 years agoMerge pull request #1972 from nnnick/fix/1971
Evert Timberg [Wed, 3 Feb 2016 01:18:03 +0000 (20:18 -0500)] 
Merge pull request #1972 from nnnick/fix/1971

Always show lines by default.

9 years agoAlways show lines by default. 1972/head
Evert Timberg [Wed, 3 Feb 2016 01:14:59 +0000 (20:14 -0500)] 
Always show lines by default.

9 years agoMerge pull request #1964 from nnnick/feature/1954
Evert Timberg [Tue, 2 Feb 2016 02:12:11 +0000 (21:12 -0500)] 
Merge pull request #1964 from nnnick/feature/1954

Add default font options

9 years agoAdd default font options 1964/head
Evert Timberg [Tue, 2 Feb 2016 02:06:54 +0000 (21:06 -0500)] 
Add default font options

9 years agoNew built files
Evert Timberg [Mon, 1 Feb 2016 23:49:11 +0000 (18:49 -0500)] 
New built files

9 years agoMerge pull request #1963 from nnnick/fix/1952
Evert Timberg [Mon, 1 Feb 2016 23:47:07 +0000 (18:47 -0500)] 
Merge pull request #1963 from nnnick/fix/1952

Fix stacked bar data limit calculation

9 years agoFix stacked bar data limit calculation 1963/head
Evert Timberg [Mon, 1 Feb 2016 23:44:39 +0000 (18:44 -0500)] 
Fix stacked bar data limit calculation

9 years agoMerge pull request #1950 from nnnick/fix/time-scale-min-max
Evert Timberg [Mon, 1 Feb 2016 23:29:56 +0000 (18:29 -0500)] 
Merge pull request #1950 from nnnick/fix/time-scale-min-max

Time scale updates to remove unnecessary extra ticks

9 years agoMinor fix 1950/head
Evert Timberg [Sat, 30 Jan 2016 22:19:32 +0000 (17:19 -0500)] 
Minor fix

9 years agoUpdate millisecond default format. Removed unnecessary space at right edge of time...
Evert Timberg [Sat, 30 Jan 2016 21:35:10 +0000 (16:35 -0500)] 
Update millisecond default format. Removed unnecessary space at right edge of time scale.

9 years agoBuilt files with latest changes
Evert Timberg [Sat, 30 Jan 2016 14:04:23 +0000 (09:04 -0500)] 
Built files with latest changes

9 years agoMerge pull request #1938 from nnnick/testing_improvements
Evert Timberg [Wed, 27 Jan 2016 23:04:22 +0000 (18:04 -0500)] 
Merge pull request #1938 from nnnick/testing_improvements

Testing improvements

9 years agoRadar controller tests 1938/head
Evert Timberg [Wed, 27 Jan 2016 23:00:32 +0000 (18:00 -0500)] 
Radar controller tests

9 years agodefault config tests
Evert Timberg [Sun, 24 Jan 2016 20:15:36 +0000 (15:15 -0500)] 
default config tests

9 years agoInitial polar area tests
Evert Timberg [Sun, 24 Jan 2016 18:29:13 +0000 (13:29 -0500)] 
Initial polar area tests

9 years agoBubble controller tests
Evert Timberg [Sun, 24 Jan 2016 15:59:19 +0000 (10:59 -0500)] 
Bubble controller tests

9 years agoLine and bar test updates
Evert Timberg [Sun, 24 Jan 2016 15:58:30 +0000 (10:58 -0500)] 
Line and bar test updates

9 years agoFix linear scale stacked mode
Evert Timberg [Sun, 24 Jan 2016 14:22:28 +0000 (09:22 -0500)] 
Fix linear scale stacked mode

9 years agoFix error in math helpers.
Evert Timberg [Sun, 24 Jan 2016 14:21:10 +0000 (09:21 -0500)] 
Fix error in math helpers.

9 years agoAdd some tests for scales. Cleaned up some minor bugs in the time scale. Wrote better...
Evert Timberg [Sat, 23 Jan 2016 17:44:55 +0000 (12:44 -0500)] 
Add some tests for scales. Cleaned up some minor bugs in the time scale. Wrote better helpers for `helpers.min` and `helpers.max`

9 years agoMerge pull request #1929 from nnnick/fix/1917 1936/head
Evert Timberg [Fri, 22 Jan 2016 03:04:31 +0000 (22:04 -0500)] 
Merge pull request #1929 from nnnick/fix/1917

Ensure that adding datasets to charts with time scales works

9 years agobuildOrUpdateControllers now returns an array of all the new controllers that were... 1929/head
Evert Timberg [Fri, 22 Jan 2016 03:00:21 +0000 (22:00 -0500)] 
buildOrUpdateControllers now returns an array of all the new controllers that were created. Build controllers before updating the scales but only reset them afterwards because the scales need to update label moments first.

9 years agoFix sample file addData button
Evert Timberg [Fri, 22 Jan 2016 02:32:59 +0000 (21:32 -0500)] 
Fix sample file addData button

9 years agoMerge pull request #1927 from nnnick/fix/1918
Evert Timberg [Fri, 22 Jan 2016 01:55:05 +0000 (20:55 -0500)] 
Merge pull request #1927 from nnnick/fix/1918

All sample files use CDN version of jQuery to make getting started easier.

9 years agoAll sample files use CDN version of jQuery to make getting started easier. 1927/head
Evert Timberg [Fri, 22 Jan 2016 01:50:48 +0000 (20:50 -0500)] 
All sample files use CDN version of jQuery to make getting started easier.

9 years agoMerge pull request #1915 from nnnick/fix/1914
Evert Timberg [Tue, 19 Jan 2016 02:38:27 +0000 (21:38 -0500)] 
Merge pull request #1915 from nnnick/fix/1914

Properly begin path before drawing line at edge of scale

9 years agoProperly begin path before drawing line at edge of scale 1915/head
Evert Timberg [Tue, 19 Jan 2016 02:35:35 +0000 (21:35 -0500)] 
Properly begin path before drawing line at edge of scale

9 years agoMerge pull request #1912 from mathiask88/pointStyleFix
Evert Timberg [Mon, 18 Jan 2016 20:55:06 +0000 (15:55 -0500)] 
Merge pull request #1912 from mathiask88/pointStyleFix

Fixes the point size for rect and rectRot

9 years agoFixes rect size 1912/head
Mathias Küsel [Mon, 18 Jan 2016 19:04:31 +0000 (20:04 +0100)] 
Fixes rect size

9 years agoMerge pull request #1911 from mathiask88/fixResize
Evert Timberg [Mon, 18 Jan 2016 17:50:46 +0000 (12:50 -0500)] 
Merge pull request #1911 from mathiask88/fixResize

Fixes resize() function

9 years agoFixes resize() function 1911/head
Mathias Küsel [Mon, 18 Jan 2016 16:46:11 +0000 (17:46 +0100)] 
Fixes resize() function

9 years agoMerge pull request #1908 from nnnick/fix/1907
Evert Timberg [Mon, 18 Jan 2016 01:39:59 +0000 (20:39 -0500)] 
Merge pull request #1908 from nnnick/fix/1907

Fix reversed ticks on linear scale + update test

9 years agoFix reversed ticks on linear scale + update test 1908/head
Evert Timberg [Mon, 18 Jan 2016 01:37:43 +0000 (20:37 -0500)] 
Fix reversed ticks on linear scale + update test

9 years agoMerge pull request #1905 from mathiask88/pointStyles
Evert Timberg [Sat, 16 Jan 2016 17:49:47 +0000 (12:49 -0500)] 
Merge pull request #1905 from mathiask88/pointStyles

Adds different point styles

9 years agoAdds different point styles 1905/head
Mathias Küsel [Sat, 16 Jan 2016 17:07:57 +0000 (18:07 +0100)] 
Adds different point styles

9 years agoMerge pull request #1900 from mathiask88/smallOptimizations
Evert Timberg [Sat, 16 Jan 2016 14:10:11 +0000 (09:10 -0500)] 
Merge pull request #1900 from mathiask88/smallOptimizations

Small optimizations

9 years agoTransition optimizations 1900/head
Mathias Küsel [Fri, 15 Jan 2016 12:06:03 +0000 (13:06 +0100)] 
Transition optimizations

9 years agoDo not calculate control points if we want straight lines
Mathias Küsel [Fri, 15 Jan 2016 12:05:51 +0000 (13:05 +0100)] 
Do not calculate control points if we want straight lines

9 years agoJust assign instead of extend
Mathias Küsel [Fri, 15 Jan 2016 12:05:23 +0000 (13:05 +0100)] 
Just assign instead of extend

9 years agoAdds a caching system to expensive measureText() function
Mathias Küsel [Fri, 15 Jan 2016 12:05:03 +0000 (13:05 +0100)] 
Adds a caching system to expensive measureText() function