Commit Graph

1187 Commits

Author SHA1 Message Date
Tyler Wolf
7e9b8c013c added d3 v3 to lib folder 2013-04-19 10:02:11 -04: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
Tyler Wolf
d6a3043a98 Merge pull request #112 from ruzz311/development
fixed invalid html in parallel coordinate example
2013-04-17 09:38:34 -07:00
Dingo
76b97fde13 all models updated to run examples using d3.v3 2013-04-16 15:54:46 -07:00
Dingo
dd94b599fe Merge branch 'development' into d3v3_Upgrade 2013-04-16 10:23:46 -07:00
Dingo
ad288b96f4 Merge branch 'master' of https://github.com/novus/nvd3 into d3v3_Upgrade 2013-04-16 10:23:20 -07:00
Dingo
05ba82c0da ran make on merge with master 2013-04-16 10:17:48 -07:00
Dingo
18b6fd4cbf Merge branch 'master' of https://github.com/novus/nvd3 into development
Conflicts:
	nv.d3.min.js
2013-04-16 10:17:05 -07:00
Dingo
80dd13db90 Merge branch 'development' of https://github.com/novus/nvd3 into development 2013-04-16 10:14:16 -07:00
Dingo
833d4391f4 changes to linePlusBar and linePlusBarWithFocus 2013-04-16 10:14:03 -07:00
Bob Monteverde
0983d3a40a Issue #109: minifying pull request 2013-04-15 07:13:52 -04:00
ciaranj
b2ef5f2254 Fixes Issue #109 - Prototype.js breaks StackedAreaChart
It appears the specification of the sizeDomain as a single element
array causes d3.js to use the wrong interpolatin function internally.
2013-04-15 12:06:39 +01:00
Russell Madsen
6bb9a2dd97 fixed invalid html in parallel coordinate example 2013-04-11 15:57:08 -05:00
Tyler Wolf
93ed2ad226 added a few semicolons 2013-04-08 17:04:33 -04:00
Tyler Wolf
36d4e999f6 removed logging from multibar.js 2013-04-08 15:29:57 -04:00
Tyler Wolf
aecb504863 Merge branch 'development' of https://github.com/novus/nvd3 into development 2013-04-08 12:41:08 -04:00
Tyler Wolf
218f284f1e Merge branch 'master' of https://github.com/novus/nvd3 into development 2013-04-08 12:40:16 -04:00
Tyler Wolf
7d69723a2d added hideable attribute to multiBar.js so that the bars can be hidden the multibar is part of a larger chart 2013-04-08 12:39:33 -04:00
Dingo
d1aeaaa9e0 Added lineplusbarwithfocuschart to makefile 2013-04-06 23:19:31 -04:00
Dingo
f41a4db9b9 updating alphabetically, working on indentedTree.js 2013-04-06 11:46:51 -04:00
Dingo
0593a97d44 fixing issue with lineWithFocusChart.js 2013-04-06 11:19:12 -04:00
Dingo
f74b4def45 updated README.md 2013-04-06 10:48:49 -04:00
Dingo
aeb3011711 Merge branch 'master' of https://github.com/novus/nvd3 into development 2013-04-06 10:45:12 -04:00
Dingo
1440722a09 Updated README.md 2013-04-06 10:39:30 -04:00
Tyler Wolf
db144a9290 updated many models for state management 2013-04-04 15:45:26 -04:00
Tyler Wolf
7335631472 merged mookie5dc-master pull request into master 2013-04-03 14:07:18 -04:00
Tyler Wolf
e092bac1c2 fixed update for parallelCoords.js, ran make for all merged pull requests 2013-04-03 14:03:25 -04:00
Tyler Wolf
aad23db0f0 Merge branch 'master' of https://github.com/novus/nvd3 2013-04-03 14:02:25 -04:00
Tyler Wolf
fb8bfe4a6a Merge pull request #6 from kapep/master
Fixed rotateLabels option for multiBarCharts
2013-04-03 10:59:33 -07:00
Tyler Wolf
9c40278049 Merge pull request #104 from areski/master
Fix Display of the PieChart example
2013-04-03 10:57:38 -07:00
Tyler Wolf
37353cb7c2 Merge branch 'master' of https://github.com/novus/nvd3 2013-04-03 13:51:22 -04:00
Tyler Wolf
c1804b29c1 Merge pull request #23 from ggriffiniii/master
Adjust tickLabel's on update rather than enter.
2013-04-03 10:50:49 -07:00
Areski Belaid
67b32ed686 Merge remote-tracking branch 'upstream/master' 2013-04-03 19:48:34 +02:00
Areski Belaid
2ea1c6f0f3 fix display of the PieChart example 2013-04-03 19:41:25 +02:00
Tyler Wolf
bd7d5b2363 Merge branch 'master' of https://github.com/novus/nvd3
Conflicts:
	examples/parallelCoordinates.html
2013-04-03 13:29:48 -04:00
Tyler Wolf
8071617d74 Merge pull request #102 from areski/master
fix parallelCoordinates example: wrong sources for js files and improve size of the example
2013-04-03 10:27:41 -07:00
Tyler Wolf
d5a44f839f Merge pull request #101 from waynn/patch-1
"yout" => "your"
2013-04-03 10:26:29 -07:00
Tyler Wolf
4107b774bc updated js sources on parallelCoordinates.js 2013-04-02 13:14:08 -04:00
Areski Belaid
7834c0ffba fix parallelCoordinates example: wrong sources for js files and improve size of the example 2013-04-02 18:31:42 +02:00
Waynn Lue
c2c1f44220 "yout" => "your" 2013-03-28 18:38:19 -07:00
Tyler Wolf
d04af78f91 Merge pull request #100 from mikewallace1979/stackedAreaChart-trigger-stateChange-on-areaClick
stackedAreaChart triggers stateChange on areaClick
2013-03-28 09:54:29 -07:00
Mike Wallace
8632be22be stackedAreaChart triggers stateChange on areaClick 2013-03-28 16:42:09 +00:00
Tyler Wolf
ae0a00c877 ran make on latest merges 2013-03-28 09:38:05 -04:00
Tyler Wolf
3ea026ab6d Merge pull request #74 from kawanet/issue-73
Issue #73 Error: Invalid value for <rect> attribute y="NaN", height="NaN"
2013-03-27 15:29:58 -07:00
Tyler Wolf
bfcbd0c764 Merge pull request #75 from wvanbergen/master
Tooltip formatting bugfix
2013-03-27 15:18:07 -07:00
Tyler Wolf
843d31229f Merge pull request #78 from michalkutil/multiBarChart-legendWidth
Multi bar chart legend width
2013-03-27 14:46:41 -07:00
Tyler Wolf
569b2a0b0d Merge pull request #93 from bertrandchenal/master
Add support for startAngle and endAngle on pie chart
2013-03-27 14:38:06 -07:00
Tyler Wolf
536e4fe531 merged pfeffer's pull request, also updated indented tree zerofilter 2013-03-27 17:35:42 -04:00
Tyler Wolf
2572a1ed21 Merge branch 'changes' of https://github.com/pfeffer/nvd3 into pfeffer-changes 2013-03-27 17:17:54 -04:00