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

Fix #322: Add "visit security settings" button when master password is entered and 2 factor authentication detected #366

Merged
merged 3 commits into from
Nov 27, 2013

Conversation

maxme
Copy link
Contributor

@maxme maxme commented Nov 26, 2013

Fix #322 - Add "visit security settings" button when master password is entered and 2 factor authentication detected - So the user is redirected to WordPress.com -> Settings -> Security can create a new application specific password from the browser.

…in WordPress.com->Settings->Security to create an app specific password when 2FA is enabled and master password entered
Conflicts:
	src/org/wordpress/android/ui/accounts/TutorialActivity.java
nbradbury added a commit that referenced this pull request Nov 27, 2013
…-detected

Fix #322: Add "visit security settings" button when master password is entered and 2 factor authentication detected
@nbradbury nbradbury merged commit bca8dab into develop Nov 27, 2013
@nbradbury nbradbury deleted the issue/322-better-ui-2fa-detected branch November 27, 2013 04:10
maxme added a commit that referenced this pull request May 1, 2016
0b74389 Merge pull request #364 from wordpress-mobile/issue/227-list-paragraph-formatting
2d1ea2a Merge pull request #363 from wordpress-mobile/issue/345-blockquote-links
b6a7d2e Merge pull request #366 from wordpress-mobile/issue/365-link-indexsizeerror
a3af084 Fixed IndexSizeError issue when inserting links in an empty post
c4c8986 Adjusted spacing for text expansion methods
b518a34 When exiting a list while the current list item is not empty, wrap the un-listed text in a paragraph node
ca00128 Fixed mistake in method call in ZSSEditor.previousNode
0a14286 Ignore break tags when finding the end of a range container
a25bf35 Don't wrap links inside blockquotes in paragraph tags if they're not at either end of the line
8420ab5 Don't wrap links in paragraph tags when the blockquote is empty
67939fa Wrap links in paragraph tags when inside blockquotes
6abc921 Merge pull request #362 from wordpress-mobile/issue/361-old-api-upload-css
b392660 Add 'uploading' class to media regardless of progress bar status
a13b162 Merge pull request #4024 from wordpress-mobile/feature/update-gradle-plugin
bfb702a Updating gradle plugin to 2.1.0 for Android Studio 2.1.0
e0e7156 Merge commit 'ac1a4af3be8b6e95d1799ce2f82fca06a73577c0' into develop
8bbe028 Merge pull request #3967 from wordpress-mobile/issue/328editor-track-reflection-failure
423bbb2 Merge pull request #3961 from wordpress-mobile/issue/3930-crash-when-adding-invalid-image
13c5880 Merge commit 'be4aac09995c4a35b2354854ef0f3ff5b1ae07e7' into develop
2bc7b91 Use a static listener to handle reflection failures
3754128 Updates the p/div conversion regex to more strictly match tags
43bab5e Move the addMediaFile logic in an AsyncTask, only WPEditImageSpan construction now lives in a background thread

git-subtree-dir: libs/editor
git-subtree-split: 0b74389ff2200e00d3db27be6087261638dafcca
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Better UI for two-steps users
2 participants