Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Protect: Add instructions for entering multiple IPs on separate lines #6046

Merged
merged 2 commits into from
Jan 11, 2017
Merged

Protect: Add instructions for entering multiple IPs on separate lines #6046

merged 2 commits into from
Jan 11, 2017

Conversation

jom
Copy link
Member

@jom jom commented Jan 6, 2017

Added Enter multiple IPs on separate lines. to Protect's Whitelist setting instructions .

Fixes #5760

Changes proposed in this Pull Request:

Before:
screen shot 2017-01-06 at 02 26 48

After:
screen shot 2017-01-06 at 02 27 22

@jeherve jeherve added [Feature] Protect Also known as Brute Force Attack Protection [Status] Needs Review This PR is ready for review. [Status] Requires String Changes [Type] Enhancement Changes to an existing feature — removing, adding, or changing parts of it labels Jan 9, 2017
@jeherve jeherve requested a review from samhotchkiss January 9, 2017 21:25
@jeherve jeherve added this to the 4.6 milestone Jan 9, 2017
@samhotchkiss samhotchkiss merged commit 3864546 into Automattic:master Jan 11, 2017
@samhotchkiss samhotchkiss removed the [Status] Needs Review This PR is ready for review. label Jan 11, 2017
@jom jom deleted the enhance/protect-ip-whitelist-instructions branch January 11, 2017 21:45
jeherve pushed a commit that referenced this pull request Jan 11, 2017
…#6046)

* Add instructions for entering multiple IPs on separate lines to Protect settings

* Reverting `jetpack-strings.php` for generation on language build
@jeherve
Copy link
Member

jeherve commented Jan 11, 2017

Cherry-picked to branch-4.5 in 5ea3e65

@jom jom restored the enhance/protect-ip-whitelist-instructions branch January 13, 2017 17:28
@jom jom deleted the enhance/protect-ip-whitelist-instructions branch January 13, 2017 17:29
dereksmart pushed a commit that referenced this pull request Jan 17, 2017
CHangelog: add #5457

Changelog: add #5487

Changelog: add #5708

Changelog: add #5879

Changelog: add #5932

Changelog: add #5963

Changelog: add #5968

Changelog: add #5996

Changelog: add #5998

Changelog: add #5999

Changelog: add #6012

Changelog: add #6013

Changelog: add #6014

Changelog: add #6015

Changelog: add #6023

Changelog: add #6024

Changelog: add #6030

Changelog: add #5465

CHangelog: add #6063

Changelog: add #6025

Changelog: add #5974

Changelog: add #6059

Changelog: add #6046

Changelog: add #5418

Changelog: move things around and add missing information.

Changelog: add #5565

Changelog: add #6087

Changelog: add #6095
dereksmart pushed a commit that referenced this pull request Jan 17, 2017
Changelog: add #5867

Changelog: add #5874

Changelog: add #5905

Changelog: add #5906

Changelog: add #5931

Changelog: add #5933

Changelog: add #5934

Bring over 4.4.2 changelog from branch-4.4

@see 18012a3

Changelog: add #5976, #5978, #5983

Changelog: add #5917

Changelog: add #5832

Changelog: add 4.4.2 release post link.

CHangelog: add #5457

Changelog: add #5487

Changelog: add #5708

Changelog: add #5879

Changelog: add #5932

Changelog: add #5963

Changelog: add #5968

Changelog: add #5996

Changelog: add #5998

Changelog: add #5999

Changelog: add #6012

Changelog: add #6013

Changelog: add #6014

Changelog: add #6015

Changelog: add #6023

Changelog: add #6024

Changelog: add #6030

Changelog: add #5465

CHangelog: add #6063

Changelog: add #6025

Changelog: add #5974

Changelog: add #6059

Changelog: add #6046

Changelog: add #5418

Changelog: move things around and add missing information.

Changelog: add #5565

Changelog: add #6087

Changelog: add #6095

Readme: add @tyxla to the list of contributors.

Improved changelog for your readability and enjoyment

updated the release date

finalizing the changelog with a few more edits
@jeherve jeherve modified the milestones: 2/17 - February, 4.5.1 Jan 30, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[Feature] Protect Also known as Brute Force Attack Protection [Status] Requires String Changes [Type] Enhancement Changes to an existing feature — removing, adding, or changing parts of it
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants