Robot/morris.js
1
0
Fork 0
mirror of https://github.com/morrisjs/morris.js.git synced 2024-11-11 05:46:37 +01:00
Code Issues Packages Projects Releases Wiki Activity
355 Commits 4 Branches 20 Tags 3.3 MiB
715771431c
Commit Graph

355 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
sudodoki
98db726906 update npm test task 2013-10-20 18:24:59 +03:00
Olly Smith
a738317adb Recompile. 2013-10-12 14:07:18 +01:00
Olly Smith
e19d676bc4 Merge branch 'grunt_update' of https://github.com/sudodoki/morris.js into sudodoki-grunt_update 2013-10-12 14:05:06 +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
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
Olly Smith
85330798d9 Merge pull request #243 from dissolved/master 
Update Developer Quickstart instructions
 2013-10-12 05:21:09 -07:00
Olly Smith
4345fa3723 Merge pull request #266 from movabletype/options-smooth-boolean 
Use the @options.smooth directly if the value's type is "boolean".
 2013-10-12 05:20:24 -07:00
sudodoki
99836064a0 adding engines and reordering move task 2013-09-25 22:26:31 +03:00
sudodoki
5c17052bb5 updating gruntfile & travis install & npm test command 2013-09-25 09:27:24 +03: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
Mathieu Bigorne
ace9fafaa6 pointSizes accepts an array of value, one per serie 2013-07-02 12:10:25 +02: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
Omar Khan
7d46e6e903 Add range selection to Morris.Grid 2013-06-17 18:50:19 +01:00
Omar Khan
f659e94eac Use mouseleave instead of mouseout 2013-06-17 16:46:14 +01:00
Omar Khan
70dce01967 Remove unused Morris.Grid#updateHover method 2013-06-17 16:17:38 +01:00
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