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

Add/jetpack protect #1501

Merged
merged 157 commits into from
Feb 2, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
157 commits
Select commit Hold shift + click to select a range
0996960
Adding the base class for the Jetpack Protect Module
roccotripaldi Dec 30, 2014
c847f4b
Protect Module: Deactivate BruteProtect on activation
roccotripaldi Jan 2, 2015
b379a10
Protect Module: new function
roccotripaldi Jan 2, 2015
9e1515c
Jepack API Base
roccotripaldi Jan 2, 2015
5f8315f
Protect Module: .com request
roccotripaldi Jan 2, 2015
7dbb410
Jetpack Protect: New endpoint
roccotripaldi Jan 9, 2015
6048f1b
Jetpack Protect: New Endpoint
roccotripaldi Jan 9, 2015
d0c4b25
Jetpack Protect: Whitelist Endpoint
roccotripaldi Jan 9, 2015
342ac89
Changing JETPACK__API_BASE
roccotripaldi Jan 10, 2015
9e5ecfa
Fixing incorrect jetpack_api_base
roccotripaldi Jan 12, 2015
fc78002
Protect Module: main blog id
roccotripaldi Jan 12, 2015
5963ec2
Protect Module: new function
roccotripaldi Jan 12, 2015
b2925d2
Protect Module: save api key
roccotripaldi Jan 12, 2015
1b43fa7
Jetpack Protect: adding configuration logic
roccotripaldi Jan 12, 2015
35896bb
Protect Module: adding some helpful code comments
roccotripaldi Jan 13, 2015
3631402
Protect Module: do NOT auto-deactivate bruteprotect
roccotripaldi Jan 13, 2015
3ce56c0
Protect Module: disable BP on succesful key
roccotripaldi Jan 13, 2015
5a86ead
Protect Module: configuration ui
roccotripaldi Jan 13, 2015
3946ffc
Jetpack Protect: adding whitelist form to the config page
roccotripaldi Jan 14, 2015
7bd0f06
Protect Module: whitelist javascript
roccotripaldi Jan 15, 2015
5624fdd
Protect Module: validating and saving whitelist
roccotripaldi Jan 15, 2015
27c40cc
Protect Module: removing an oops!
roccotripaldi Jan 15, 2015
22b4c80
Protect Module: Adding a debug tool
roccotripaldi Jan 15, 2015
09152ea
Protect Module: Adding blocking mechanisms
roccotripaldi Jan 16, 2015
4cbb8ad
Adding the base class for the Jetpack Protect Module
roccotripaldi Dec 30, 2014
972bf75
Protect Module: Deactivate BruteProtect on activation
roccotripaldi Jan 2, 2015
115005e
Protect Module: new function
roccotripaldi Jan 2, 2015
0f23a15
Jepack API Base
roccotripaldi Jan 2, 2015
6b9f1a5
Protect Module: .com request
roccotripaldi Jan 2, 2015
0e0dbf5
Changing JETPACK__API_BASE
roccotripaldi Jan 10, 2015
388b3af
Fixing incorrect jetpack_api_base
roccotripaldi Jan 12, 2015
54c4fb6
Protect Module: main blog id
roccotripaldi Jan 12, 2015
9268e2f
Protect Module: new function
roccotripaldi Jan 12, 2015
dedb2f3
Protect Module: save api key
roccotripaldi Jan 12, 2015
8020624
Jetpack Protect: adding configuration logic
roccotripaldi Jan 12, 2015
12d8eea
Protect Module: adding some helpful code comments
roccotripaldi Jan 13, 2015
cf3db2e
Protect Module: do NOT auto-deactivate bruteprotect
roccotripaldi Jan 13, 2015
55c64e6
Protect Module: disable BP on succesful key
roccotripaldi Jan 13, 2015
2b80f45
Protect Module: configuration ui
roccotripaldi Jan 13, 2015
3ddbd05
Jetpack Protect: adding whitelist form to the config page
roccotripaldi Jan 14, 2015
ab91e78
Protect Module: whitelist javascript
roccotripaldi Jan 15, 2015
a8bd50b
Protect Module: validating and saving whitelist
roccotripaldi Jan 15, 2015
5bb6b21
Protect Module: removing an oops!
roccotripaldi Jan 15, 2015
74ada70
Protect Module: Adding a debug tool
roccotripaldi Jan 15, 2015
56e46a1
Protect Module: Adding blocking mechanisms
roccotripaldi Jan 16, 2015
7d93193
Merge branch 'add/jetpack-protect' of github.com:Automattic/jetpack i…
roccotripaldi Jan 16, 2015
40ad838
Merge branch 'master' into add/jetpack-protect
samhotchkiss Jan 16, 2015
fe51754
Fix transient name and SSL check logic
samhotchkiss Jan 16, 2015
8bba51e
Add BruteProtect server to definitions
samhotchkiss Jan 16, 2015
f5ca3d4
Reworked the get_main_blog_jetpack_id
samhotchkiss Jan 16, 2015
fbe3e98
add in TODOs
samhotchkiss Jan 16, 2015
16fd332
note to self...
samhotchkiss Jan 16, 2015
7b1f467
Translation - add description header to tranlation file
dereksmart Jan 16, 2015
a29b458
Styling Jetpack Protect Config Page
jeffgolenski Jan 19, 2015
8f01048
Continued Jetpack Protect Config page styling
jeffgolenski Jan 19, 2015
54e33dc
Continued HTML + CSS mods of Protect Config page
jeffgolenski Jan 19, 2015
36ac210
Protect Module: updating whitelist JS
roccotripaldi Jan 19, 2015
d67dc39
Continued CSS + HTML mods for protect config
jeffgolenski Jan 20, 2015
86b6f78
Error and responsive styling
jeffgolenski Jan 20, 2015
ed6a6ea
responsive styling
jeffgolenski Jan 20, 2015
135e0f8
Merge pull request #1522 from Automattic/add/whitelist-endpoints
roccotripaldi Jan 20, 2015
574e0da
Cleaning up spacing issues in CSS
jeffgolenski Jan 20, 2015
d7069ae
Protect Module: updating whitelist endpoint to reflect new schema
roccotripaldi Jan 21, 2015
aa3b9ba
Update our transient storage/retrieval
samhotchkiss Jan 21, 2015
c3cdf88
Merge branch 'add/jetpack-protect' of github.com:Automattic/jetpack i…
samhotchkiss Jan 21, 2015
8e8ea09
Add transient cleanup to protect module
samhotchkiss Jan 21, 2015
315f511
Add transient cleanup to protect module
samhotchkiss Jan 21, 2015
ab9df3b
Add in successful login logging
samhotchkiss Jan 21, 2015
6c3d421
Protect Module: improving UI on the whitelist form
roccotripaldi Jan 21, 2015
829d182
Protect Module: add actions to the base class to accept ajax
roccotripaldi Jan 22, 2015
9c0ea8a
Protect Module: delete IP address with AJAX
roccotripaldi Jan 22, 2015
29e7fad
add in dashboard widget
samhotchkiss Jan 22, 2015
ee6fed5
Return dashboard widget
samhotchkiss Jan 22, 2015
50bc9d2
fix function name
samhotchkiss Jan 22, 2015
b1b2f2b
echo output
samhotchkiss Jan 22, 2015
af59998
Coded HTML for Protect Widget
jeffgolenski Jan 22, 2015
5f60796
Protect Module: adding an IP Address via AJAX
roccotripaldi Jan 22, 2015
ac49d73
Merge branch 'add/jetpack-protect' of github.com:Automattic/jetpack i…
roccotripaldi Jan 22, 2015
fe0973a
Began coding CSS for Protect Widget
jeffgolenski Jan 22, 2015
c562973
styling updated whitelist form + prefix removal
jeffgolenski Jan 22, 2015
10c8da6
removing dismissal icon for widget
jeffgolenski Jan 22, 2015
909e335
adjusting HTML + CSS for responsive
jeffgolenski Jan 22, 2015
46f865d
responsive styling for inputs
jeffgolenski Jan 22, 2015
19bf21e
small screen style tweaks
jeffgolenski Jan 22, 2015
f0d36ba
Whitelist config: unneeded element removal
jeffgolenski Jan 22, 2015
c8138a3
Whitelist config: unneeded element removal
jeffgolenski Jan 22, 2015
762303a
whitelist config: responsive styling
jeffgolenski Jan 23, 2015
a4f2cf6
Whitelisting: Fine element details styling
jeffgolenski Jan 23, 2015
d842ec8
Adding to-do list + adding elements
jeffgolenski Jan 23, 2015
7f610ee
Added some static elements to html
jeffgolenski Jan 23, 2015
b8e2cd3
Protect Module: adding current user's IP to the config page
roccotripaldi Jan 23, 2015
cedac5b
Protect Module: new function
roccotripaldi Jan 23, 2015
f0b07cd
Added icons near Protect headlines
jeffgolenski Jan 23, 2015
67124e5
Protect Module: style change on whitelist form
roccotripaldi Jan 23, 2015
b68b737
Merge branch 'add/jetpack-protect' of github.com:Automattic/jetpack i…
roccotripaldi Jan 23, 2015
1edb346
Protect Module: improved ajax delete on the whitelist form
roccotripaldi Jan 23, 2015
13bd81a
Lots of responsive tweaks for new inputs
jeffgolenski Jan 23, 2015
df19d6b
tweaking alignment of shield icon
jeffgolenski Jan 23, 2015
ca66740
commenting out sharing for now
jeffgolenski Jan 23, 2015
5e16ac5
Added _protect-widget.scss molecule (inactive)
jeffgolenski Jan 23, 2015
4b31561
Adding protect css to scss files
jeffgolenski Jan 26, 2015
bfaf197
removing protect.css
jeffgolenski Jan 26, 2015
3bdb38e
moving protect dashboard widget css into own file
jeffgolenski Jan 26, 2015
b5d8a0d
trying to enqueue inlined styles
jeffgolenski Jan 26, 2015
4c0f6ce
Protect Widget: correct path for enqueuing inline stylez
dereksmart Jan 26, 2015
823d5d9
cleaned up spacing issues & comments
jeffgolenski Jan 27, 2015
107f069
_protect.scss: Cleaned up
jeffgolenski Jan 27, 2015
8aeda76
Whitespaces, Trasnlations, & WP coding styles
dereksmart Jan 27, 2015
25ed8e4
More spacing/translation fixes
dereksmart Jan 27, 2015
4be93d3
Protect Module: Improving IP detection
roccotripaldi Jan 27, 2015
953f086
Protect Module: improving is_ip_private
roccotripaldi Jan 27, 2015
68ff8a4
Added alert messages to widget
jeffgolenski Jan 27, 2015
b60e9a1
Added social sharing capability for widget
jeffgolenski Jan 27, 2015
76ac717
Protect: add a few missing translation functions
jeherve Jan 28, 2015
00fb982
Protect: double quotes to prevent an error
jeherve Jan 28, 2015
b6038a7
Protect: deactivate BruteProtect to avoid conflicts with Jetpack
jeherve Jan 28, 2015
7abb838
Protect Module: fixing the whitelist endpoint
roccotripaldi Jan 29, 2015
40457e1
Protect Module: reformatting the response for the GET whitelist endpoint
roccotripaldi Jan 29, 2015
a9f58d4
added comment to styling
jeffgolenski Jan 29, 2015
33addc7
Protect Module: creating shared functions
roccotripaldi Jan 30, 2015
d282427
Merge branch 'add/jetpack-protect' of github.com:Automattic/jetpack i…
roccotripaldi Jan 30, 2015
74faa82
Removing sharing icons for mobile devices
jeffgolenski Jan 30, 2015
9ea933f
Removed irrelevant media query
jeffgolenski Jan 30, 2015
50503da
Protect Module: Improving IP whitelist form to be consistent with WP
roccotripaldi Jan 30, 2015
6d7dae5
Merge branch 'add/jetpack-protect' of github.com:Automattic/jetpack i…
roccotripaldi Jan 30, 2015
4ae69be
update math fallback class to include a fallback
samhotchkiss Jan 30, 2015
00d3817
Merge branch 'add/jetpack-protect' of github.com:Automattic/jetpack i…
samhotchkiss Jan 30, 2015
2b8bd05
Protect Module: log failed attempts back to the server
roccotripaldi Jan 30, 2015
e08d4d0
Merge branch 'add/jetpack-protect' of github.com:Automattic/jetpack i…
roccotripaldi Jan 30, 2015
b327eb6
namespacing
samhotchkiss Jan 30, 2015
3d65d47
Merge branch 'add/jetpack-protect' of github.com:Automattic/jetpack i…
samhotchkiss Jan 30, 2015
ffc2137
fix function name
samhotchkiss Jan 30, 2015
fb0fe35
change namespacing to use jpp, not brute
samhotchkiss Jan 30, 2015
38e042d
reduce available attempts
samhotchkiss Jan 30, 2015
24d5953
Protect Module: moving get_ip() to shared functions
roccotripaldi Jan 30, 2015
e575110
Merge branch 'add/jetpack-protect' of github.com:Automattic/jetpack i…
roccotripaldi Jan 30, 2015
aa64d9c
Protect Module: fixing structure of get_ip function
roccotripaldi Jan 30, 2015
a21dab2
Protect Module: moving IP is private to shared functions
roccotripaldi Jan 30, 2015
7fa8c11
Protect Module: adding a field to the whitelist endpoint response
roccotripaldi Jan 30, 2015
60a072b
Styled whitelist config textarea
jeffgolenski Jan 30, 2015
cf28c77
Protect Module: Improving translation strings
roccotripaldi Jan 30, 2015
6e2c0e3
Merge branch 'add/jetpack-protect' of github.com:Automattic/jetpack i…
roccotripaldi Jan 30, 2015
96ab61e
another text area adjustment
jeffgolenski Jan 30, 2015
1e45cda
Loading widget styles only on dashboard setup
jeffgolenski Jan 30, 2015
9b44ff3
Protect Module: Improving translation wrapping
roccotripaldi Jan 31, 2015
7614b46
Merge branch 'add/jetpack-protect' of github.com:Automattic/jetpack i…
roccotripaldi Jan 31, 2015
68b0bfa
Minor verbiage/whitespace/docs edits
dereksmart Feb 2, 2015
9c62c18
remove completed TODOs
dereksmart Feb 2, 2015
ba8958f
prep widget for i11n
samhotchkiss Feb 2, 2015
75a700b
Protect Module: adding link to dashboard widget
roccotripaldi Feb 2, 2015
9ab2ec6
Merge branch 'master' into add/jetpack-protect
samhotchkiss Feb 2, 2015
cc2f341
Protect Module: using site_option
roccotripaldi Feb 2, 2015
81b3158
Merge branch 'add/jetpack-protect' of github.com:Automattic/jetpack i…
roccotripaldi Feb 2, 2015
cca0eb3
removing inline styles fron config page
jeffgolenski Feb 2, 2015
987cb4b
Protect Module: dashboard widget notification
roccotripaldi Feb 2, 2015
f4eca85
Merge branch 'add/jetpack-protect' of github.com:Automattic/jetpack i…
roccotripaldi Feb 2, 2015
ce8579e
Protect Module: don't need user_ip in the whitelist endpoint
roccotripaldi Feb 2, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ var admincss = [
'modules/omnisearch/omnisearch-jetpack',
'modules/post-by-email/post-by-email',
'modules/publicize/assets/publicize',
'modules/protect/protect-dashboard-widget',
'modules/sharedaddy/admin-sharing',
'modules/videopress/videopress-admin',
'modules/widget-visibility/widget-conditions/widget-conditions',
Expand Down
1 change: 1 addition & 0 deletions class.jetpack.php
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ class Jetpack {
'omnisearch' => array( 'jetpack-omnisearch/omnisearch.php', 'Jetpack Omnisearch' ),
'gravatar-hovercards' => array( 'jetpack-gravatar-hovercards/gravatar-hovercards.php', 'Jetpack Gravatar Hovercards' ),
'latex' => array( 'wp-latex/wp-latex.php', 'WP LaTeX' ),
'protect' => array( 'bruteprotect/bruteprotect.php', 'BruteProtect' ),
);

var $capability_translations = array(
Expand Down
222 changes: 221 additions & 1 deletion css/jetpack-admin-rtl.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion css/jetpack-admin-rtl.min.css

Large diffs are not rendered by default.

220 changes: 220 additions & 0 deletions css/jetpack-admin.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion css/jetpack-admin.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion css/jetpack-admin.min.css

Large diffs are not rendered by default.

Loading