Merge 20140804 #937
Closed
Merge 20140804 #937
Conversation
This file contains hidden or 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
Used to cast and filter the result of the list plugins endpoint. + Add 'safehtml' type applies wp_kses to the response value. Used to sanitize the plugin description. Merges r101961-wpcom.
Used to safe cast the module description. Merges r102179-wpcom.
Since we've already found the category by ID there's no need to search it by slug again, specially when the slug doesn't match what's in the database. See: http://[private link] Merges r102318-wpcom.
Conflicts: class.json-api-endpoints.php
see https://[private link] Merges r101978-wpcom.
…en it's empty see https://[private link]#comment-1657 Merges r102297-wpcom.
Conflicts: json-endpoints.php
…en it's empty see https://[private link]#comment-1657 Merges r102297-wpcom.
Since we've already found the category by ID there's no need to search it by slug again, specially when the slug doesn't match what's in the database. See: http://[private link] Merges r102318-wpcom.
… Customizer hooks in non-admin context. Props kovshenin, see #6733. Merges r102282-wpcom.
Avoid trailing whitespace. Conflicts: modules/theme-tools/social-links.php
Contributor
|
I'm closing this now, I and @enejb have both run merges since, so this is probably outdated at this point. |
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 represents the latest changes from wpcom to be merged into Jetpack.