lp://staging/~mardy/ubuntu-system-settings-online-accounts/2fa-1541274

Branch merges

Propose for merging

No branches dependent on this one.

Approved for merging into lp://staging/ubuntu-system-settings-online-accounts

PS Jenkins bot (community): Needs Fixing (continuous-integration) on 2016-03-11

Online Accounts: Pending requested 2016-02-26

Diff: 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)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1541274: Add support for 2FA in dialog requests

High

Fix Committed

Link a bug report

Related blueprints

339. By Alberto Mardegan on 2016-04-15

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 on 2016-04-07

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 on 2016-03-11

Dialog: use full width

336. By Alberto Mardegan on 2016-03-04

Revert last change

335. By Alberto Mardegan on 2016-03-03

debugging

334. By Alberto Mardegan on 2016-03-03

Use email characters for username

333. By Alberto Mardegan on 2016-03-03

spacing

332. By Alberto Mardegan on 2016-02-08

Fix dbus keys

331. By Alberto Mardegan on 2016-02-04

Add test for error message

330. By Alberto Mardegan on 2016-02-04

Add tests