Robot/morris.js
1
0
Fork 0
mirror of https://github.com/morrisjs/morris.js.git synced 2024-11-14 07:41:11 +01:00
Code Issues Projects Releases Packages Wiki Activity
422 commits 4 branches 20 tags 3.3 MiB
Commit graph

106 commits

Author SHA1 Message Date
Jelte Fennema
9bc123a53a Merge pull request #548 from JelteF/shown-hover-fix2 
Fix error that occured when having hidden lines between shown lines
 2015-01-17 19:22:01 +01:00
Jelte Fennema
93342c5a73 Fix error that occured when having hidden lines between shown lines 2015-01-16 18:15:37 +01:00
Richard Moorhead
4949be8901 free positioned x coords, custom x labels, updated README.md to include 
bower instructions
 2015-01-10 17:02:08 -06:00
Jelte Fennema
a7e1cdd142 Merge pull request #543 from arlaneenalra/line-chart-label 
Fix label color in line chart - Squash Commits in #542.
 2015-01-09 11:32:39 +01:00
Chris S
de9a12def5 Fix label color in line chart. 
The line chart code always defaulted to using trendLineColors for
labels even when no trend lines were enabled.  This commit changes
that to use lineColors instead so that the labels match the lines
they are for.
 2015-01-08 10:03:21 -06:00
Jelte Fennema
5c3f11226a Merge pull request #461 from JelteF/weighted-trendline 
Add optional weighting to the calculation of the trendline
 2015-01-08 12:55:23 +01:00
Jelte Fennema
6996ae2473 Merge pull request #467 from JelteF/hidden-series-hover-fix 
Fix hover positioning for linecharts when some lines are hidden
 2015-01-08 12:55:09 +01:00
Jelte Fennema
e396732fa1 Merge pull request #462 from JelteF/feature-align-left 
Add option to align Y labels left
 2015-01-08 12:54:56 +01:00
Jelte Fennema
ac48c048a0 Merge pull request #510 from JelteF/monthlines 
Add vertical grid lines to line graphs
 2015-01-08 12:51:48 +01:00
Jelte Fennema
c8e14ae163 Add vertical grid lines to line graphs 2014-10-15 16:53:15 +02:00
Jelte Fennema
1c66cfc4ac Merge pull request #464 from JelteF/escape-hover 
Escape labels in hover
 2014-10-15 13:58:05 +02:00
Jelte Fennema
5da0060322 Fix hover positioning for linecharts when some lines are hidden 2014-07-23 17:16:26 +02:00
Jelte Fennema
77c24f6b70 Escape labels in hover 2014-07-16 23:24:16 +02:00
Jelte Fennema
20ffef7c0e Add option to align Y labels left 2014-07-15 23:56:54 +02:00
Jelte Fennema
a8c7cd9e30 Add optional weighting to the calculation of the trendline 2014-07-15 19:12:08 +02:00
Jelte Fennema
0192dd0eee Pass series index to yLabelFormat 2014-07-15 17:55:56 +02:00
Jelte Fennema
a9076b2cc4 Merge pull request #452 from JelteF/feature-noshow 2014-07-15 15:45:22 +02:00
Olly Smith
cab4b6d859 Merge pull request #450 from JelteF/feature-trendline 
Add trend line calculation
 2014-07-14 21:19:54 +01:00
Olly Smith
ed1bc7584a Merge pull request #449 from JelteF/pointsize-zero 
Don't grow a point if its size is 0
 2014-07-14 21:15:23 +01:00
Jelte Fennema
877e341ac4 Add feature to not show certain plots, but still show values in the legend 2014-07-12 17:35:21 +02:00
Jelte Fennema
3c7398d0b6 Add trendline calculation 2014-07-10 22:53:43 +02:00
Jelte Fennema
46022aabe0 Don't grow a point if its size is 0 2014-07-10 18:59:24 +02:00
Jelte Fennema
f92f5bf6fb Add feature to pass false as a label so it isn't displayed 2014-07-10 18:54:29 +02:00
Olly Smith
8f8aa35e3b (Finally) deprecate continuousLine option. 2014-05-05 21:38:39 +01: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
sudodoki
9162df9f62 some coffee idioms, common constructor change 2013-10-25 00:34:05 +03: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
d889eb6268 Merge pull request #257 from mathieubigorne/master 
pointSize attribute should accept an array of values
 2013-10-12 05:35:34 -07: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
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
Mathieu Bigorne
ace9fafaa6 pointSizes accepts an array of value, one per serie 2013-07-02 12:10:25 +02: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
7d46e6e903 Add range selection to Morris.Grid 2013-06-17 18:50:19 +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
6220c40217 Add gridTextFamily and gridTextWeight options. 2013-05-12 16:25:06 +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
67caadb600 Customizing hover content using default content (fixes #179). 2013-04-14 10:25:14 +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
Marcin Chwedziak
3a2ab2e909 Merge branch 'master' into event-handling 
Conflicts:
	lib/morris.donut.coffee
	morris.js
	morris.min.js
 2013-03-31 20:39:32 +02:00
Marcin Chwedziak
3c9fff0aa0 #199, added behaveLikeLine and fillOpacity options, refactored morris.line to separate line and point draw operation 2013-03-31 20:16:35 +02:00