New PR for other libs content #211
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
- includes minor editing Merge remote-tracking branch 'upstream/master' into 68-other-libs-new-PR * upstream/master: (96 commits) added alt text to pictures and themeroller logo minor correction to the themeroller text added a tutorial on how to use themeroller to create a jQuery Mobile custom theme Fixing syntax highlighting add deferreds content Revert "Changed /page/ to /pages/ for consistency with other content repos" Changed /page/ to /pages/ for consistency with other content repos Update CONTRIBUTING.md Update page/using-jquery-core/manipulating-elements.md Fixed 'MDN JavaScript Reference' link. Upgrade to grunt-jquery-content 0.7.0 and grunt-wordpress 1.0.5. Proper attribution for @scottgonzalez on jQuery UI Widget Factory article originally from his blog post Use _.uniq to get unique contributors array from git history instead of manually forEach'ing. Properly credit @jorydotcom for her work in creating the style guide before it was split into its own file Actually include the legacy contributor in the contributors list Initial implementation of parsing git file history and pushing git contributor/legacy attribution list into WordPress Upgrade to grunt-jquery-content 0.6.2. Fix attribution on Understanding Index article Remove unused exercise files - fixes jquery#137 Remove "adding keyboard navigation" and "enabling the back button" articles for now ... Conflicts: order.yml page/using-jquery-core/avoid-conflicts-other-libraries.md
Closed
|
Woo! Go go clean(er) merges :) |
addyosmani
added a commit
that referenced
this pull request
Dec 31, 2012
New PR for other libs content
|
Thanks for refreshing this PR @rmurphey and @addyosmani! @addyosmani in the future please ensure that new commits are actually able to |
|
I certainly will, @ajpiano! Thanks for catching and fixing the outstanding |
arthurvr
pushed a commit
to arthurvr/learn.jquery.com
that referenced
this pull request
Jan 4, 2015
New PR for other libs content
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.
re #163, #68
This PR should supersede #163 and merge more cleanly.