Merge dc.js develop branch and resolve conflicts #1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dc.js 2.0 beta 1 feature-complete, no breaking changes from this point Conflicts: Changelog.md dc.js dc.min.js package.json regression/rendered-stock-fixture.html web/docs/api-latest.md web/docs/index.html web/js/dc.js
unversioned tag release: add logo to main page and favicon Conflicts: Changelog.md
dc.js 2.0.0-beta.2 Conflicts: dc.min.js
correct changelog Conflicts: Changelog.md
2.0.0-beta.3 * last version was improperly tagged Conflicts: Changelog.md dc.js dc.min.js package.json regression/rendered-stock-fixture.html web/docs/api-latest.md web/docs/index.html web/js/dc.js
2.0.0 beta 4 Conflicts: Changelog.md dc.js dc.min.js package.json regression/rendered-stock-fixture.html web/docs/api-latest.md web/docs/index.html web/js/dc.js
2.0.0 beta.5 Conflicts: Changelog.md dc.js dc.min.js package.json regression/rendered-stock-fixture.html web/docs/api-latest.md web/docs/index.html web/js/dc.js
…opy files to web.
this is indeed available in 1.7.3, but undocumented.
update tests for updated jasmine
@mtraynham, what do you think about cases that are checked by both jshint and jscs: should one take precedence? I'm not trying to set policy here, but I needed an exception for an identifier controlled by GitHub, and didn't want to add two local options for it.
it's somewhat incomprehensible though :(
thanks @mtraynham! Merge remote-tracking branch 'origin/pr/978' into hotfix/2.0.0-beta.18
doesn't seem to be safe to use this in parallel on jshint and jscs i guess if jshint succeeds it marks the file as succeeded or something
would like to but whoo that's a lot of work for dc-js#978
into hotfix/2.0.0-beta.18 closes dc-js#939
dc.js 2.0 beta 18 also delint specs/sources and convert selectMenu docs to jsdoc
warning hack Conflicts: dc.js.map dc.min.js dc.min.js.map web/js/dc.js.map web/js/dc.min.js web/js/dc.min.js.map
Conflicts: dc.js dc.js.map dc.min.js dc.min.js.map src/core.js web/js/dc.js web/js/dc.js.map web/js/dc.min.js web/js/dc.min.js.map
also, not sure how this errant parameter name got through our very rigorous linter Conflicts: dc.js dc.js.map dc.min.js dc.min.js.map src/core.js web/js/dc.js web/js/dc.js.map web/js/dc.min.js web/js/dc.min.js.map
Conflicts: dc.js.map dc.min.js dc.min.js.map web/js/dc.js.map web/js/dc.min.js web/js/dc.min.js.map
with windows-generated files with CRLFs
Conflicts: dc.js dc.js.map dc.min.js dc.min.js.map src/filters.js web/docs/api-latest.md web/js/dc.js
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hey @blairn,
I was trying to use your sunburst chart and had to merge with latest from dc-js develop branch on my fork.
Accepting this PR should resolve conflicts in the PR u raised: dc-js#907