Merge lp://qastaging/~mardy/ubuntu-system-settings-online-accounts/2fa-1541274 into lp://qastaging/ubuntu-system-settings-online-accounts
| Status: | Approved | ||||
|---|---|---|---|---|---|
| Approved by: | David Barth | ||||
| Approved revision: | 337 | ||||
| Proposed branch: | lp://qastaging/~mardy/ubuntu-system-settings-online-accounts/2fa-1541274 | ||||
| Merge into: | lp://qastaging/ubuntu-system-settings-online-accounts | ||||
| Diff against target: |
310 lines (+132/-10) 3 files modified
online-accounts-ui/dialog-request.cpp (+33/-0) online-accounts-ui/qml/SignOnUiDialog.qml (+56/-10) tests/online-accounts-ui/qml/tst_SignOnUiDialog.qml (+43/-0) |
||||
| To merge this branch: | bzr merge lp://qastaging/~mardy/ubuntu-system-settings-online-accounts/2fa-1541274 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
| Online Accounts | Pending | ||
|
Review via email:
|
|||
Commit message
Add 2fa support
Description of the change
Add 2fa support
| PS Jenkins bot (ps-jenkins) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
Unmerged revisions
- 339. By Alberto Mardegan
-
Merge from trunk
[ Alberto Mardegan ]
* Always show the UbuntuOne provider in the providers list (LP:
#1559506)
* Enable scrolling in authorization page. (LP: #1561031)
[ CI Train Bot ]
* Resync trunk. - 338. By Alberto Mardegan
-
Update from trunk
[ Alberto Mardegan ]
* Fix false positive in duplicate account detection (LP: #1560494)
[ CI Train Bot ]
* Resync trunk.
[ Alberto Mardegan ]
* Bind flickable to page. (LP: #1544033)
* Don't crash on invalid providers (LP: #1554254)
* Don't use deprecated onLoadingChanged signal. (LP: #1544063)
* ProviderRequest: fix single account handling in authorization page
(LP: #1552762)
* Update authorisation prompt (LP: #1544919)
[ CI Train Bot ]
* Resync trunk.
[ Alberto Mardegan ]
* Add check for duplicate account detection (LP: #1468599)
[ CI Train Bot ]
* Resync trunk. - 337. By Alberto Mardegan
-
Dialog: use full width
- 336. By Alberto Mardegan
-
Revert last change
- 335. By Alberto Mardegan
-
debugging
- 334. By Alberto Mardegan
-
Use email characters for username
- 333. By Alberto Mardegan
-
spacing
- 332. By Alberto Mardegan
-
Fix dbus keys
- 331. By Alberto Mardegan
-
Add test for error message
- 330. By Alberto Mardegan
-
Add tests
FAILED: Continuous integration, rev:332
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://