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
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
Olly Smith
5e240e64fe
WIP: interval improvements
2013-03-29 11:48:24 -07:00
Olly Smith
4cab2bbabb
Fix DST handling.
2013-03-14 22:08:19 +00:00
Olly Smith
8107d8d396
More tidying up donuts.
2013-02-24 17:52:35 +00:00
Olly Smith
a7a22532e3
parseFloat for donut values.
2013-02-24 17:20:17 +00:00
Olly Smith
6207c210ac
Refactor / bugfix event and goal drawing. ( fixes #181 )
2013-02-08 08:06:02 +00:00
Olly Smith
49a7a02774
Donut label color - fixes #159 .
2013-02-06 08:27:13 +00:00
Olly Smith
481401c3b7
No need to bail any more when initialising with no data.
2013-02-06 07:40:25 +00:00
Olly Smith
811dc87d8b
Hide chart when setData is passed empty or null array. ( Fixes #142 )
2013-02-06 07:35:54 +00:00
Olly Smith
541874b2ce
Rebuild.
2013-01-24 16:28:29 -08:00
Olly Smith
cd5129c489
Merge branch 'wrap_raphael_add_classes' of https://github.com/chriserin/morris.js into chriserin-wrap_raphael_add_classes
...
Conflicts:
lib/morris.donut.coffee
2013-01-24 15:48:39 -08:00
Olly Smith
d87c0ef8ae
Rename strokeColor -> backgroundColor.
2013-01-24 15:38:49 -08:00
Olly Smith
2cce7c43de
Merge branch 'master' of https://github.com/peteralaoui/morris.js into peteralaoui-master
...
Conflicts:
morris.min.js
2013-01-24 15:34:04 -08:00
Pierre Dulac
1703eb54a9
Add a strokeColor options to the Donut class
...
to be able to present the donut over another background than a white
one.
2013-01-18 01:11:08 +01:00
tiraeth
2489c1a430
fixed hideHover=auto for line/area chart
2013-01-02 12:19:52 +01:00
m.chwedziak
889a2e8cda
Click events for current oesmith/master
2012-12-31 12:02:14 +01:00