Commit Graph

422 Commits

Author SHA1 Message Date
dhoko
b192a00d68 Add week in label_specs 2013-06-04 21:38:35 +02:00
Ryan Sandridge
5ee4f4179c Update README to reflect current grunt installation instructions. 2013-05-21 15:07:26 -04:00
Olly Smith
b98ae8ab1d v0.4.3 2013-05-12 17:20:45 +01: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
e5c856fb10 Fix area chart fill colors for very light lines (fixes #190). 2013-05-10 07:40:51 +01:00
Olly Smith
b722937920 Merge pull request #239 from oesmith/diagonal-series
Diagonal series
2013-05-09 14:22:10 -07:00
Olly Smith
05cdc7f3e4 Angled labels. 2013-05-09 22:15:05 +01:00
Marcin Chwedziak
c170062eae removed unnecessary object property set 2013-05-09 21:24:24 +02: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
8ae673e766 Merge pull request #224 from GranData/master
Format X Label values
2013-04-24 23:17:23 -07:00
Olly Smith
80c63ab164 Merge pull request #229 from wbond/hover-wiggle
Fixes #186 - changed CSS top value for hover to be an int
2013-04-24 23:11:33 -07:00
wbond
a1c74d6a82 Fixes #186 - changed CSS top value for hover to be an int 2013-04-24 23:22:29 -04:00
Tomas Zulberti
143a9dbb77 Fomatted integer values
Solved issue #29
2013-04-17 15:53:55 -03:00
Olly Smith
d8667c72dd Changelog for v0.4.2 2013-04-14 10:40:32 +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
Olly Smith
80453b95b5 Merge pull request #218 from tiraeth/217-donut-click
fixes #217, quick merge please
2013-04-13 13:59:16 -07: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
5d9bf447c5 Remove unused argument. 2013-04-01 21:32:03 +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
Marcin Chwedziak
0cbd83371f merged with oesmith/master 2013-03-31 18:48:04 +02:00
Olly Smith
6f5aff1d90 Pin grunt (so travis works). 2013-03-31 18:47:10 +02:00
Olly Smith
5e240e64fe WIP: interval improvements 2013-03-29 11:48:24 -07:00
Olly Smith
7a9f523bb0 Pin grunt (so travis works). 2013-03-14 22:28:57 +00:00
Olly Smith
4cab2bbabb Fix DST handling. 2013-03-14 22:08:19 +00:00
Olly Smith
4ecffd8d77 Ensure @width / @height are positive. 2013-03-14 21:43:59 +00:00
Olly Smith
cb854c0086 npm test script. 2013-03-14 21:35:25 +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
c3df64cbd4 v0.4.1 2013-02-08 08:11:19 +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
6e0e5f0468 Merge branch 'master' of github.com:oesmith/morris.js 2013-02-06 07:36:17 +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
cc6c89d537 Merge pull request #175 from itto/master
Fix typo in stacked_bar example
2013-02-05 23:05:55 -08:00
Kristof De Loof
96723e48db Fixed typo in stacked_bars example filename 2013-01-28 23:28:59 +01:00
Olly Smith
a83c7e07f8 v0.4.0 package.json 2013-01-26 22:53:44 +00:00
Olly Smith
4c4b7f73aa v0.4.0 Changelog 2013-01-26 09:54:10 +00:00
Olly Smith
541874b2ce Rebuild. 2013-01-24 16:28:29 -08:00