Commit Graph

204 Commits

Author SHA1 Message Date
Jelte Fennema
93342c5a73 Fix error that occured when having hidden lines between shown lines 2015-01-16 18:15:37 +01: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
a002a02691 Merge pull request #475 from JelteF/hit-checking-on-click
Hit checking on click
2015-01-08 12:54:39 +01:00
Jelte Fennema
cbd5f8c636 Merge pull request #479 from JelteF/pass-src-barColor-function
Src attribute of a row gets passed to the barColors function as well
2015-01-08 12:53:44 +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
763c91e795 Add an option to display the value of a bar in the bar itself (only for horizontal bars) 2014-10-26 13:29:10 +01:00
Jelte Fennema
77011bbae4 Merge pull request #517 from JelteF/off-by-one-bar
Fix off by one error when shown was not given
2014-10-25 17:42:14 +02:00
Jelte Fennema
5f1ea081a5 Fix off by one error when shown was not given 2014-10-25 17:40:54 +02:00
Jelte Fennema
c8e14ae163 Add vertical grid lines to line graphs 2014-10-15 16:53:15 +02:00
Jelte Fennema
9f26a5efe6 Add grid click return value to check for hitting of a bar 2014-10-15 15:34:44 +02:00
Jelte Fennema
75cdb5bd97 Merge pull request #498 from fran6co/events
Adds events range
2014-10-15 14:01:41 +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
Francisco Facioni
a5705894fa Adds events range 2014-09-23 08:06:55 -03:00
Francisco Facioni
ab0bad541d Fixes copy&paste error in event
This was referenced in 715771431c
2014-09-22 16:17:58 -03:00
Jelte Fennema
ef8b3f3276 Merge pull request #458 from JelteF/non-blurry-lines
Fix blurry lines
2014-08-14 14:48:15 +02:00
Jelte Fennema
025fb4887a Merge pull request #474 from JelteF/horizontal-bar-click-fix
A small fix that makes the click handler work for horizontal bar charts
2014-08-14 14:41:43 +02:00
Jelte Fennema
d54a039837 Merge pull request #460 from JelteF/horizontal-bar-fixes
Fix transX
2014-08-14 14:32:51 +02:00
Jelte Fennema
1074ec41d3 Src attribute of a row gets passed to the barColors function as well 2014-08-12 18:36:19 +02:00
Jelte Fennema
c83274e5f7 Fix value of @bars 2014-07-30 12:31:38 +02:00
Jelte Fennema
127b2bf271 A small fix that makes the click handler work for horizontal bar charts 2014-07-29 16:37:15 +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
2901f63fba Fix transX 2014-07-15 18:24:20 +02:00
Jelte Fennema
0192dd0eee Pass series index to yLabelFormat 2014-07-15 17:55:56 +02:00
Jelte Fennema
bc76a22ec3 Fix blurry lines 2014-07-15 16:02:34 +02:00
Jelte Fennema
a9076b2cc4 Merge pull request #452 from JelteF/feature-noshow 2014-07-15 15:45:22 +02:00
Jelte Fennema
6aa57ca30e Horizontal bar: Fix stacked and vertical grid 2014-07-15 14:57:37 +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
Olly Smith
8c100cde86 Merge pull request #448 from JelteF/feature-nolabel
Add feature to pass false as a label so it isn't displayed
2014-07-14 21:13:06 +01:00
Jelte Fennema
715771431c Add horizontal barchart option 2014-07-14 00:15:21 +02: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
2df090ee48 Fix touch events. 2014-06-15 21:01:21 +01:00
Olly Smith
1f0abcd631 Merge branch 'master' of github.com:oesmith/morris.js 2014-06-14 09:58:31 +01:00
Olly Smith
587ecaa784 Fix stacked=false in bar chart (fixes #275). 2014-06-14 09:58:16 +01:00
Olly Smith
aca2438c00 Merge pull request #297 from sudodoki/feature/vertical_grid
feature: configurable vertical segments
2014-06-14 08:07:32 +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
sudodoki
e3e50aac93 Implement #311: feature - bar max width 2014-01-30 01:57:57 +02:00
sudodoki
e8d84dca09 feature: configurable vertical segments 2013-11-16 01:53:37 +02:00