]>
git.ipfire.org Git - thirdparty/Chart.js.git/log
Tanner Linsley [Sat, 13 Feb 2016 06:03:44 +0000 (23:03 -0700)]
Documentation Updates for UMD support
Tanner Linsley [Fri, 12 Feb 2016 06:45:30 +0000 (23:45 -0700)]
Built Files
Tanner Linsley [Fri, 12 Feb 2016 06:45:25 +0000 (23:45 -0700)]
Updated Samples
Tanner Linsley [Fri, 12 Feb 2016 06:45:14 +0000 (23:45 -0700)]
Core helpers reference
Tanner Linsley [Fri, 12 Feb 2016 06:25:06 +0000 (23:25 -0700)]
Testing for the new build system
Tanner Linsley [Fri, 12 Feb 2016 06:16:43 +0000 (23:16 -0700)]
Passing All Tests, Updated Dependencies
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)
Tanner Linsley [Fri, 12 Feb 2016 03:30:53 +0000 (20:30 -0700)]
Browserify for easier UMD consumptions and vanilla builds
Tanner Linsley [Wed, 10 Feb 2016 19:15:40 +0000 (12:15 -0700)]
Merge branch 'v2.0-dev' into fix-legend-tooltip-stacked-ordering
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
Robert Becker [Tue, 9 Feb 2016 12:04:07 +0000 (13:04 +0100)]
Updated build and documentation
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
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
etimberg [Mon, 8 Feb 2016 01:06:50 +0000 (20:06 -0500)]
Update bar sample file to use elements config. Fixes #1292
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
etimberg [Mon, 8 Feb 2016 00:55:32 +0000 (19:55 -0500)]
Update docs for #1144
etimberg [Mon, 8 Feb 2016 00:48:39 +0000 (19:48 -0500)]
Add docs for global font options
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. …
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.
Robert Becker [Fri, 5 Feb 2016 13:36:37 +0000 (14:36 +0100)]
Removed nbproject folder
Robert Becker [Fri, 5 Feb 2016 09:11:58 +0000 (10:11 +0100)]
Chart.js was missing?
Robert Becker [Fri, 5 Feb 2016 08:43:20 +0000 (09:43 +0100)]
Fixed tab sizing in core.helpers.js
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.
Robert Becker [Fri, 5 Feb 2016 08:33:57 +0000 (09:33 +0100)]
Further reformatted scale.linear.js to match original indenting.
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.
Robert Becker [Thu, 4 Feb 2016 14:28:06 +0000 (15:28 +0100)]
Removed debug log.
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.
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
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.
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.
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.
Evert Timberg [Wed, 3 Feb 2016 01:14:59 +0000 (20:14 -0500)]
Always show lines by default.
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
Evert Timberg [Tue, 2 Feb 2016 02:06:54 +0000 (21:06 -0500)]
Add default font options
Evert Timberg [Mon, 1 Feb 2016 23:49:11 +0000 (18:49 -0500)]
New built files
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
Evert Timberg [Mon, 1 Feb 2016 23:44:39 +0000 (18:44 -0500)]
Fix stacked bar data limit calculation
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
Evert Timberg [Sat, 30 Jan 2016 22:19:32 +0000 (17:19 -0500)]
Minor fix
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.
Evert Timberg [Sat, 30 Jan 2016 14:04:23 +0000 (09:04 -0500)]
Built files with latest changes
Evert Timberg [Wed, 27 Jan 2016 23:04:22 +0000 (18:04 -0500)]
Merge pull request #1938 from nnnick/testing_improvements
Testing improvements
Evert Timberg [Wed, 27 Jan 2016 23:00:32 +0000 (18:00 -0500)]
Radar controller tests
Evert Timberg [Sun, 24 Jan 2016 20:15:36 +0000 (15:15 -0500)]
default config tests
Evert Timberg [Sun, 24 Jan 2016 18:29:13 +0000 (13:29 -0500)]
Initial polar area tests
Evert Timberg [Sun, 24 Jan 2016 15:59:19 +0000 (10:59 -0500)]
Bubble controller tests
Evert Timberg [Sun, 24 Jan 2016 15:58:30 +0000 (10:58 -0500)]
Line and bar test updates
Evert Timberg [Sun, 24 Jan 2016 14:22:28 +0000 (09:22 -0500)]
Fix linear scale stacked mode
Evert Timberg [Sun, 24 Jan 2016 14:21:10 +0000 (09:21 -0500)]
Fix error in math helpers.
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`
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
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.
Evert Timberg [Fri, 22 Jan 2016 02:32:59 +0000 (21:32 -0500)]
Fix sample file addData button
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.
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.
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
Evert Timberg [Tue, 19 Jan 2016 02:35:35 +0000 (21:35 -0500)]
Properly begin path before drawing line at edge of scale
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
Mathias Küsel [Mon, 18 Jan 2016 19:04:31 +0000 (20:04 +0100)]
Fixes rect size
Evert Timberg [Mon, 18 Jan 2016 17:50:46 +0000 (12:50 -0500)]
Merge pull request #1911 from mathiask88/fixResize
Fixes resize() function
Mathias Küsel [Mon, 18 Jan 2016 16:46:11 +0000 (17:46 +0100)]
Fixes resize() function
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
Evert Timberg [Mon, 18 Jan 2016 01:37:43 +0000 (20:37 -0500)]
Fix reversed ticks on linear scale + update test
Evert Timberg [Sat, 16 Jan 2016 17:49:47 +0000 (12:49 -0500)]
Merge pull request #1905 from mathiask88/pointStyles
Adds different point styles
Mathias Küsel [Sat, 16 Jan 2016 17:07:57 +0000 (18:07 +0100)]
Adds different point styles
Evert Timberg [Sat, 16 Jan 2016 14:10:11 +0000 (09:10 -0500)]
Merge pull request #1900 from mathiask88/smallOptimizations
Small optimizations
Mathias Küsel [Fri, 15 Jan 2016 12:06:03 +0000 (13:06 +0100)]
Transition optimizations
Mathias Küsel [Fri, 15 Jan 2016 12:05:51 +0000 (13:05 +0100)]
Do not calculate control points if we want straight lines
Mathias Küsel [Fri, 15 Jan 2016 12:05:23 +0000 (13:05 +0100)]
Just assign instead of extend
Mathias Küsel [Fri, 15 Jan 2016 12:05:03 +0000 (13:05 +0100)]
Adds a caching system to expensive measureText() function
Mathias Küsel [Thu, 14 Jan 2016 17:17:14 +0000 (18:17 +0100)]
Removes unused context bindings
Evert Timberg [Thu, 14 Jan 2016 16:02:51 +0000 (11:02 -0500)]
Merge pull request #1887 from mathiask88/v2.0-dev
Add option to disable line drawing
Mathias Küsel [Thu, 14 Jan 2016 12:39:06 +0000 (13:39 +0100)]
Add option to disable line drawing
Evert Timberg [Tue, 12 Jan 2016 13:22:36 +0000 (08:22 -0500)]
Merge pull request #1893 from mathiask88/updateOptimizations
Add some optimizations to often used functions
Mathias Küsel [Tue, 12 Jan 2016 08:47:55 +0000 (09:47 +0100)]
Add some optimizations to often used functions
Evert Timberg [Tue, 12 Jan 2016 02:57:52 +0000 (21:57 -0500)]
Merge pull request #1892 from davis/v2.0-dev
Fix orf/olf being undefined
Davis Kim [Tue, 12 Jan 2016 02:54:45 +0000 (18:54 -0800)]
Fix orf/olf being undefined
Evert Timberg [Sat, 9 Jan 2016 19:47:24 +0000 (14:47 -0500)]
Merge pull request #1879 from nnnick/fix/1110
Fix/1110
Evert Timberg [Sat, 9 Jan 2016 19:42:55 +0000 (14:42 -0500)]
Make sure tick string could be null / undefined
Evert Timberg [Sat, 9 Jan 2016 19:39:43 +0000 (14:39 -0500)]
Add template option for point labels + test + doc update
Evert Timberg [Sat, 9 Jan 2016 16:59:39 +0000 (11:59 -0500)]
Merge pull request #1878 from nnnick/fix/1871
Don't try to use undefined Scale constructors
Evert Timberg [Sat, 9 Jan 2016 16:55:44 +0000 (11:55 -0500)]
Don't try to use undefined Scale constructors
Evert Timberg [Sat, 9 Jan 2016 15:48:15 +0000 (10:48 -0500)]
Update build
Evert Timberg [Sat, 9 Jan 2016 15:01:19 +0000 (10:01 -0500)]
Merge pull request #1877 from nnnick/fix/1862
Fix stacked combo bar charts & add test
Evert Timberg [Sat, 9 Jan 2016 14:58:14 +0000 (09:58 -0500)]
Update bar controller tests
Evert Timberg [Sat, 9 Jan 2016 14:51:04 +0000 (09:51 -0500)]
Add test for scale
Evert Timberg [Sat, 9 Jan 2016 14:50:56 +0000 (09:50 -0500)]
Update controllers
Evert Timberg [Fri, 8 Jan 2016 18:16:06 +0000 (13:16 -0500)]
Merge pull request #1854 from nnnick/fix/1853
Do not force resize if the size has not changed
Evert Timberg [Thu, 7 Jan 2016 21:21:49 +0000 (16:21 -0500)]
Merge pull request #1866 from morleyzhi/v2.0-dev
Fix a bug where ticks get culled when they don't need to be (fixes #1865)
Morley Zhi [Thu, 7 Jan 2016 20:57:53 +0000 (15:57 -0500)]
Fix a bug where ticks get culled when they don't need to be
Evert Timberg [Thu, 7 Jan 2016 19:43:59 +0000 (14:43 -0500)]
Merge pull request #1863 from morleyzhi/v2.0-dev
Use ticks.maxTicksLimit to limit gridLines in a similar way
Morley Zhi [Thu, 7 Jan 2016 17:41:42 +0000 (12:41 -0500)]
Re-enable this; turns out I was mislead by the label spacing
Morley Zhi [Thu, 7 Jan 2016 17:37:13 +0000 (12:37 -0500)]
Looks like maxTicksLimit already limits gridlines, so restore this
Morley Zhi [Thu, 7 Jan 2016 17:28:09 +0000 (12:28 -0500)]
Always show the last tick
Morley Zhi [Thu, 7 Jan 2016 16:40:26 +0000 (11:40 -0500)]
Updates
(1) Only limit gridlines when maxTicksLimit is defined, so we don't blow up the tests.
(2) Add a note about running tests in CONTRIBUTING.md
(3) Rebuild files
Morley Zhi [Thu, 7 Jan 2016 15:44:56 +0000 (10:44 -0500)]
Use ticks.maxTicksLimit to limit gridlines (fixes #1859); use getValueOrDefault for resolving the maxTicksLimit option
Evert Timberg [Thu, 7 Jan 2016 02:06:36 +0000 (21:06 -0500)]
Merge pull request #1850 from kirushanth-sakthivetpillai/bugfix/browserify-umd
Update gulpfile.js
Evert Timberg [Wed, 6 Jan 2016 01:16:18 +0000 (20:16 -0500)]
Do not force resize if the size has not changed
Kirushanth Sakthivetpillai [Tue, 5 Jan 2016 16:19:48 +0000 (11:19 -0500)]
Update gulpfile.js
root can be either window, globals but without this, JS will not lookup in globals object
Evert Timberg [Sun, 3 Jan 2016 14:11:58 +0000 (09:11 -0500)]
Update built files