Commit Graph

422 Commits

Author SHA1 Message Date
Vazgen Torosyan
62bd692d2b Update morris.js 2017-03-13 13:01:40 +04:00
Alexander Simonov
14530d0733 Merge pull request #677 from MoreThanRewards/master
Added main file designation to package.json.
2016-09-13 20:49:44 +03:00
Tony Lechner
942bf1562d Added main file designation to package.json.
Resolves #595
2016-07-05 14:01:53 -05:00
Benjamin Ellis
baaaa8f00b Merge pull request #590 from kkirsche/patch-1
Remove moot `version` property from bower.json
2015-12-04 19:20:34 +00:00
Kevin Kirsche
05afeebef5 Remove moot version property from bower.json
Per bower/bower.json-spec@a325da3
2015-06-10 19:01:07 -04:00
Jelte Fennema
08064399d6 Merge pull request #568 from leriel/hover-bars
add option to fade in bars on hover
2015-05-08 14:28:59 +02:00
Jelte Fennema
b27c815750 Merge pull request #580 from mortonfox/patch-1
Fix two of the issue links.
2015-05-01 14:06:40 +02:00
Morton Fox
8c14e61550 Fix two of the issue links. 2015-04-29 12:22:55 -04:00
leriel
94eec4a81b add option to fade in bars on hover 2015-03-23 21:43:27 +01:00
Jelte Fennema
4ccdd7694d Merge pull request #549 from JelteF/empty-bar-hover-fix
Fix hover error when hovering over an empty bar chart
2015-01-17 19:22:22 +01:00
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
570f7561d5 Merge pull request #477 from autodidacticon/master
free positioned x coords, custom x labels
2015-01-17 19:20:44 +01:00
Jelte Fennema
4e43a590c4 Fix hover error when hovering over an empty bar chart 2015-01-16 18:27:11 +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
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
d008d9317f Merge pull request #518 from JelteF/in-bar-value
Add an option to display the value of a bar in the bar itself
2015-01-08 12:51:36 +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
f17d78fd2e Rebuild to fix a serious bug. 2014-10-25 17:44:21 +02: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
Jelte Fennema
a158fb7677 Merge pull request #484 from JelteF/master
Rebuild files
2014-10-08 16:33:41 +02:00
Francisco Facioni
a5705894fa Adds events range 2014-09-23 08:06:55 -03:00
Jelte Fennema
93c7441bbc Merge pull request #497 from fran6co/patch-1
Fixes copy&paste error in event
2014-09-23 12:28:55 +02: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
2356f4977e Rebuild. 2014-08-14 15:38:30 +02: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
bb86c78613 Merge pull request #459 from JelteF/better-ylabel-callback
Pass series index to yLabelFormat
2014-08-14 14:32:08 +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