Robot/morris.js
1
0
Fork 0
mirror of https://github.com/morrisjs/morris.js.git synced 2024-11-10 21:36:34 +01:00
Code Issues Packages Projects Releases Wiki Activity
379 Commits 4 Branches 20 Tags 3.3 MiB
ef8b3f3276
Commit Graph

180 Commits

Author SHA1 Message Date
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
127b2bf271 A small fix that makes the click handler work for horizontal bar charts 2014-07-29 16:37:15 +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
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
6422b543be Merge branch 'feature/coffee_idioms' of https://github.com/sudodoki/morris.js into sudodoki-feature/coffee_idioms 
Conflicts:
	lib/morris.grid.coffee
 2013-11-09 17:50:53 +00:00
Olly Smith
221c83781d Tidy up. 
- The options namespace should stay flat - no nested config values.
- Used single array literal instead of chained Array.concats.
- Added default values to config defaults, instead of using default
  method arguments.
- Tweaked spec.
 2013-11-09 17:23:07 +00:00
Olly Smith
415476f7ca Merge branch 'feature/rounded_corners' of https://github.com/sudodoki/morris.js into sudodoki-feature/rounded_corners 2013-11-09 16:56:32 +00:00
Olly Smith
4580852416 Merge pull request #306 from sudodoki/feature/xLabelPadding 
feature: option to set padding for x axis label
 2013-11-09 08:52:46 -08: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
sudodoki
c9820c2d44 it is actually only top padding 2013-10-26 00:49:14 +03:00
sudodoki
b79e0be820 feature: optional xAxisLabelPadding 2013-10-26 00:18:16 +03:00
sudodoki
ca371d112a feature: round-corners for bars in barchart 2013-10-25 23:54:18 +03:00
sudodoki
9162df9f62 some coffee idioms, common constructor change 2013-10-25 00:34:05 +03: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
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
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