Pull request of pull requests #128
Merged
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
… usual prototype parsing).
…ure-constructor Conflicts: lib/dox.js
Conflicts: lib/dox.js
commit 30a97fba5202ad1f5865e039d92a34e86f0aeb5f
Author: ChiperSoft <chiper@chipersoft.com>
Date: Wed Aug 27 11:51:50 2014 -0700
Line numbers fully working
commit d14b45837b462ef22db1ba9cee280131dd99b43c
Merge: 725e09b bda0a96
Author: ChiperSoft <chiper@chipersoft.com>
Date: Wed Aug 27 08:50:23 2014 -0700
Merge branch 'master' into linenum
Conflicts:
lib/dox.js
commit 725e09b
Author: Stephen Oney <swloney@gmail.com>
Date: Mon Dec 16 13:39:18 2013 -0500
small modifications
commit 39beee0
Author: Stephen Oney <swloney@gmail.com>
Date: Mon Dec 16 13:35:04 2013 -0500
Added line_num
commit 30d822a81fc6c621e8f9677688e5564b687f7d20
Author: ChiperSoft <chiper@chipersoft.com>
Date: Wed Aug 27 13:50:12 2014 -0700
Lint skipping properly
commit 7523b93a29d21ba2654070ea5d0720cea6981968
Merge: 52fb67a 132babf
Author: ChiperSoft <chiper@chipersoft.com>
Date: Wed Aug 27 13:43:58 2014 -0700
Merge branch 'master' into lint
commit 52fb67a46d53255922bd3f4daf3177383d36c6b7
Author: ChiperSoft <chiper@chipersoft.com>
Date: Wed Aug 27 13:16:40 2014 -0700
attempting more accurate matching
commit 09ec2546a697b99f9a016d5e75de2981a1b36a7f
Merge: 7c5a8bf 3cc4615
Author: ChiperSoft <chiper@chipersoft.com>
Date: Wed Aug 27 12:25:49 2014 -0700
Merge branch 'master' into lint
Conflicts:
lib/dox.js
test/dox.test.js
commit 7c5a8bf
Author: Russ Frank <rf@uber.com>
Date: Tue Jun 10 16:30:42 2014 +0000
checking if prefix is a prefix rather than substr
commit 2e7591e
Author: Russ Frank <rf@uber.com>
Date: Mon Jun 9 15:19:32 2014 +0000
skipPrefix option for skipping linter flags
commit f01f659
Author: Russ Frank <rf@uber.com>
Date: Mon Jun 9 15:11:44 2014 +0000
also ignoring eshint and jslint directives
commit 21836de
Author: Russ Frank <rf@uber.com>
Date: Fri Jun 6 21:50:17 2014 +0000
Ignore jshint directives. Fixes #74
Conflicts: lib/dox.js
|
Wow, it is huge! Great job! |
Closed
This was referenced Sep 4, 2014
Closed
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.
This PR merges the following existing PRs under a single merge that is resolved against master and cleaned up for project standards and tests. Some original commits were squashed in the process of making these fixes, apologies to those contributors.
constructortype #97I believe these changes also render the following PRs redundant:
I've also added the top contributors to the package.json (according to github) and addressed a few context conditions that were missing.
I'm 90% certain that there's no breaking changes in this, but I would still recommend bumping the next release to 0.5 if this is accepted.