Commit Graph

510 Commits

Author SHA1 Message Date
Robin Hu
9122285ae5 Merge branch 'development' of https://github.com/novus/nvd3 into development
Conflicts:
	nv.d3.min.js
2013-07-01 10:32:04 -04:00
Tyler Wolf
c1db474991 Merge branch 'development' of https://github.com/novus/nvd3 into development
Conflicts:
	nv.d3.min.js
2013-06-28 11:27:46 -04:00
Tyler Wolf
705f7efb29 Merge branch 'master' into development
Conflicts:
	nv.d3.js
2013-06-28 11:26:43 -04:00
Tyler Wolf
9d13fb73a4 updated multiChart to allow changing yDomain on yscales 2013-06-28 11:26:12 -04:00
Robin Hu
d10350455e Added 'rightAlign' property to legend.js (defaults to true). If set to 'false', legends become left aligned. 2013-06-27 15:39:18 -04:00
Robin Hu
24b949d931 Fixed two stacked area chart issues:
1. When in expanded view in stacked area chart, if there is missing data (zero data), 'holes' will be displayed in the chart where data is missing.
2. Tooltips used to be disabled if the stacked area showed values less than zero. This functionality has been disabled.
2013-06-25 12:06:14 -04:00
Robin Hu
c57626ad9b Merge branch 'master' of https://github.com/novus/nvd3
Conflicts:
	examples/historicalBarChart.html
	nv.d3.js
	nv.d3.min.js
	src/models/historicalBarChart.js
	src/nv.d3.css
2013-06-21 15:48:43 -04:00
Tyler Wolf
abeac917da fixed a merge conflict. No change to master code, so this commit is not tagged 2013-06-18 18:59:14 -04:00
Tyler Wolf
086e0e5d9e Merge branch 'grunt' of https://github.com/lihongxun945/nvd3 into lihongxun945-grunt
Conflicts:
	nv.d3.min.js
2013-06-18 18:54:34 -04:00
Robin Hu
104921eb68 rebuilding nv.d3.js and minified version. 2013-06-17 10:26:38 -04:00
Robin Hu
0151cdccab Made it so that double clicking a legend item will cause all other series' to be disabled. 2013-06-11 16:38:39 -04:00
Robin Hu
739b93fecf Adding ability to right align the Y-axis for historical bar and line charts. 2013-06-11 12:59:33 -04:00
Robin Hu
319520513f Updated historical bar chart so that the xAxis.ticks property must be set by the user of the chart. Also changed is so that the y-axis has 0 transition. 2013-06-10 12:02:56 -04:00
Robin Hu
62edb49ab8 Added showXAxis and showYAxis feature to lineChart and historicalBarChart. 2013-06-07 17:07:00 -04:00
Robin Hu
7bf1091f41 Adding historical bar chart. 2013-06-07 16:34:57 -04:00
Robin Hu
1703cc428a Adding historical bar chart code. 2013-06-07 16:24:51 -04:00
Robin Hu
65b97714fa Merge branch 'master' of https://github.com/novus/nvd3
Conflicts:
	nv.d3.min.js
2013-06-07 16:05:49 -04:00
Robin Hu
a9b6f3ab09 FIxing bug in line.js. 2013-06-07 15:34:49 -04:00
Dingo
b0bc28cbe0 fixed cumulativeLineChart drag lag 2013-06-03 23:51:42 -04:00
Tyler Wolf
af8b13dd48 Merge branch 'master' of https://github.com/novus/nvd3 into development
Conflicts:
	nv.d3.min.js
2013-05-31 10:00:03 -04:00
frank shao
90e4078941 Adjusted jitter in scatter.js 2013-05-31 09:57:33 -04:00
Tyler Wolf
a437d1ef0e Merge branch 'master' of https://github.com/novus/nvd3 into development
Conflicts:
	nv.d3.min.js
2013-05-31 09:48:48 -04:00
Robin Hu
577a57d405 Rebuilding nv.d3.js and nv.d3.min.js for Issue #140 2013-05-22 14:55:06 -04:00
Tyler Wolf
bd0aab25ca lots of changes 2013-05-17 19:31:30 -04:00
Tyler Wolf
1ac80d87c8 Merge branch 'master' of https://github.com/novus/nvd3 into development
Conflicts:
	nv.d3.min.js
2013-05-17 16:49:32 -04:00
Tyler Wolf
a6c18a730a almost there 2013-05-17 16:48:52 -04:00
Robin Hu
1097586ec3 Rebuilding nv.d3.js and nv.d3.min.js 2013-05-15 13:15:58 -04:00
Tyler Wolf
fb5897eb52 progress 2013-05-13 19:09:23 -04:00
Tyler Wolf
a67a42333e updates, on hperf pages 2013-05-13 15:14:32 -04:00
twolfnovus
a65b5c4988 Merge branch 'master' of https://github.com/novus/nvd3 into development
Conflicts:
	nv.d3.min.js
2013-05-13 12:03:13 -04:00
Robin Hu
ba44aa3053 Fixing issue #136. Improved logic in tooltip.js for handling <svg> and <g> tags. 2013-05-10 09:31:02 -04:00
Robin Hu
9fc096f3a4 Rebuilt nv.d3.js and nv.d3.min.js for issue #22 2013-05-09 17:11:46 -04:00
twolfnovus
f108de0bd1 Merge branch 'master' of https://github.com/novus/nvd3 into development
Conflicts:
	nv.d3.min.js
2013-05-09 11:47:46 -04:00
Robin Hu
d690c17a2b Fixed issue #25. Updated logic in tooltip.js, so that tooltips are not inserted into SVG containers. 2013-05-08 13:12:51 -04:00
Robin Hu
4ba155d733 For ticket AN-617. Added ability to create an 'average' horizontal line for cumulative line charts. Updated the example HTML file too. 2013-05-08 10:40:05 -04:00
Robin Hu
95b0459d27 Fixed issue #76. Tooltips were not rendering for bullet charts. 2013-05-07 15:52:46 -04:00
Robin Hu
92df22993d Added calcApproxTextWidth util function. Fixed overlapping legend, as noted in issue #107. 2013-05-07 14:26:00 -04:00
Robin Hu
0c422148d9 Merge branch 'master' into development
Conflicts:
	nv.d3.min.js
2013-05-07 12:04:13 -04:00
Robin Hu
7662281809 Rebuilt nv.d3.js 2013-05-07 12:00:17 -04:00
Robin Hu
0894152def Fixed issue #131. Was able to remove errors:
d='MZ', cx="NaN", cy="NaN".  The error "Problem parsing d=''" remains.
2013-05-07 11:56:42 -04:00
twolfnovus
f00781535b Merge branch 'master' of https://github.com/novus/nvd3 into development
Conflicts:
	nv.d3.js
	nv.d3.min.js
	src/models/multiBar.js
2013-05-07 11:06:52 -04:00
Robin Hu
2350f4a60b Rebuilt nv.d3.js and nv.d3.min.js, for issue #77 fix. 2013-05-07 10:27:34 -04:00
twolfnovus
a10c25b333 a few changes for v3 upgrade 2013-05-06 18:02:23 -04:00
twolfnovus
0d5f297d61 updated cumulativeLineChart.js 2013-05-02 13:34:36 -04:00
twolfnovus
d3c44f7f00 ran make on 'development' 2013-05-02 12:00:29 -04:00
lihongxun
2a394feab3 add grunt, see more in README.md about how to use intstall and use grunt 2013-04-24 21:14:11 +08:00
Tyler Wolf
b682cf6ad3 Merge branch 'master' into development
Conflicts:
	nv.d3.min.js
2013-04-19 09:59:11 -04:00
Tyler Wolf
43e86f5405 fixed some small, but problematic issues with indented tree 2013-04-19 09:53:29 -04:00
Dingo
76b97fde13 all models updated to run examples using d3.v3 2013-04-16 15:54:46 -07:00
Dingo
05ba82c0da ran make on merge with master 2013-04-16 10:17:48 -07:00