Robot
/
morris.js
mirror of https://github.com/morrisjs/morris.js.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
421 Commits 4 Branches 20 Tags 3.3 MiB
Commit Graph

186 Commits

Author SHA1 Message Date
Jelte Fennema f17d78fd2e Rebuild to fix a serious bug. 2014-10-25 17:44:21 +02:00
Jelte Fennema 2356f4977e Rebuild. 2014-08-14 15:38:30 +02:00
Edgars Beigarts 18db33cf9d Bump version in all the files 2014-07-14 10:26:44 +03:00
Olly Smith 2df090ee48 Fix touch events. 2014-06-15 21:01:21 +01:00
Olly Smith 4a67502b05 Rebuild. 2014-06-14 09:58:59 +01:00
Olly Smith 587ecaa784 Fix stacked=false in bar chart (fixes #275). 2014-06-14 09:58:16 +01:00
Olly Smith 4346d98fdd Merge branch 'master' of https://github.com/mikach/morris.js 
Conflicts:
	morris.min.js
 2014-06-14 08:01:24 +01:00
Olly Smith 8f8aa35e3b (Finally) deprecate continuousLine option. 2014-05-05 21:38:39 +01:00
mikach 9532354320 Hide hover tooltip if empty 2014-04-03 19:37:57 +03:00
Olly Smith 3063cf5688 Fix specs. 2014-03-19 20:55:54 +00:00
Olly Smith 2d25af9098 Re-build. 2014-02-23 19:54:38 +00:00
Olly Smith 063957657c Add perceptual diffs. 
Uses perceptualdiff to catch regressions / changes in charts as they are
displayed by a browser (in this case, phantomjs).

Currently has exemplaries for basic line, area, bar and stacked bar
charts.
 2013-11-10 22:09:01 +00:00
Olly Smith 68aa4c36f2 Add original data to custom hover callback. 
Chart data points are sorted when using parseTime, so indices will not
always match the original data ordering.

Also fixes a couple of event triggers.

Ref: #264.
 2013-11-09 20:36:47 +00:00
Olly Smith c07222445c setData() method for Morris.Donut. 
Fixes #211
 2013-11-09 19:53:50 +00:00
Olly Smith 88e3fe6211 Automatic resizing. 
Fixes #111. It's a costly operation, but it's working.
 2013-11-09 19:33:36 +00:00
Olly Smith c1264caa61 Use local third-party javascript for examples. 
Move scripts from spec/lib into third_party, update references.
 2013-11-09 16:50:32 +00:00
Alex Brinkman b162e18cce Adds the ability to mark events on a non-time-based line graph 2013-11-03 20:58:17 -07:00
Olly Smith a738317adb Recompile. 2013-10-12 14:07:18 +01:00
Olly Smith 7123d419a6 Merge branch 'master' of https://github.com/stlk/morris.js into stlk-master 
Conflicts:
	morris.min.js
 2013-10-12 14:02:06 +01:00
Olly Smith 0e8c0f49b6 Merge branch, and merge with previous changes. 
Previous point-width work by other contributors conflicted, so have tied
the two changes and sets of tests together. Have also slightly changed
some variable / config names to read easier.

Merge branch 'master' of https://github.com/dgilperez/morris.js into dgilperez-master

Conflicts:
	lib/morris.line.coffee
	morris.js
	morris.min.js
 2013-10-12 13:58:10 +01:00
Olly Smith 005edd9770 Rebuild JS. 2013-10-12 13:37:29 +01:00
Olly Smith 96e918a297 Merge branch 'disable-individual-axes' of https://github.com/arachnys/morris.js into arachnys-disable-individual-axes 
Conflicts:
	morris.min.js
 2013-10-12 13:32:25 +01:00
Olly Smith e868701016 Merge branch 'range-selection' of https://github.com/arachnys/morris.js into arachnys-range-selection 
Conflicts:
	morris.min.js
 2013-10-12 13:27:35 +01:00
Olly Smith 019a04ed08 Merge branch 'label_specs_week' of https://github.com/dhoko/morris.js into dhoko-label_specs_week 
Conflicts:
	morris.min.js
 2013-10-12 13:24:09 +01:00
Josef Rousek e31c466528 You can now specify segment color in data parameter 2013-09-11 14:37:32 +02:00
David Gil 8817e221b5 fix hilight WIP 2013-08-20 04:10:18 +02:00
David Gil 92d7790908 pointGrow and pointShrink must adapt to the point size position of the index 2013-08-20 04:06:07 +02:00
David Gil f4478828e4 making point size customizable per line as well 2013-08-20 03:39:43 +02:00
David Gil cdfe8ba62d add missing index 2013-08-20 02:55:44 +02:00
David Gil c613aeb988 make line widths customizable 2013-08-20 02:38:48 +02:00
Taku AMANO 13af310795 Use the @options.smooth directly if the value's type is "boolean". 2013-07-30 10:39:25 +09:00
Omar Khan d1420482f1 axes option can be true, false, 'both', 'x', 'y' 2013-06-23 22:47:44 +01:00
Omar Khan cccf319f38 Add xaxis and yaxis options for disabling axes individually 2013-06-20 13:09:04 +01:00
Omar Khan 14d45161b4 Compile js 2013-06-17 18:55:04 +01:00
dhoko b192a00d68 Add week in label_specs 2013-06-04 21:38:35 +02:00
Olly Smith 8493b6ec25 Fix hideHover (fixes #236). 2013-05-12 17:12:59 +01:00
Olly Smith 8bc716f820 Update internal data array when using setData (fixes #213). 2013-05-12 16:56:25 +01:00
Olly Smith 6220c40217 Add gridTextFamily and gridTextWeight options. 2013-05-12 16:25:06 +01:00
Olly Smith feca1ecaeb Make event handlers chainable. 2013-05-10 07:41:09 +01:00
Olly Smith 05cdc7f3e4 Angled labels. 2013-05-09 22:15:05 +01:00
Marcin Chwedziak 3960ecfcdb adds xLabelsDiagonal options, as asked in #235 2013-05-09 21:21:52 +02:00
Olly Smith f857797684 Build 2013-04-25 07:31:39 +01:00
Olly Smith 67caadb600 Customizing hover content using default content (fixes #179). 2013-04-14 10:25:14 +01:00
Olly Smith b9f53a8fdb Merge branch 'master' of github.com:oesmith/morris.js 
Conflicts:
	morris.min.js
 2013-04-14 09:18:28 +01:00
Olly Smith 96530d7576 Fix Y label sizing. 2013-04-14 09:13:31 +01:00
Marcin Chwedziak a87c47296c fixes #217, quick merge please 2013-04-10 22:00:50 +02:00
Olly Smith 347533c8dd Fix defaults check. 2013-04-01 21:41:13 +01:00
Olly Smith 76921e0f88 Merge branch 'event-handling' of https://github.com/tiraeth/morris.js 
Conflicts:
	morris.min.js
 2013-04-01 21:29:55 +01:00
Olly Smith ee004b6c12 Merge branch '199-area' of https://github.com/tiraeth/morris.js 
Conflicts:
	morris.min.js
 2013-04-01 21:05:22 +01:00
Olly Smith 6d6e07b2aa Better automatic y-labelling. 2013-04-01 20:35:27 +01:00