Merge lp://qastaging/~mardy/ubuntu-system-settings-online-accounts/fullscreen-dialog into lp://qastaging/ubuntu-system-settings-online-accounts
| Status: | Approved |
|---|---|
| Approved by: | David Barth |
| Approved revision: | 353 |
| Proposed branch: | lp://qastaging/~mardy/ubuntu-system-settings-online-accounts/fullscreen-dialog |
| Merge into: | lp://qastaging/ubuntu-system-settings-online-accounts |
| Diff against target: |
907 lines (+374/-127) 13 files modified
debian/control (+1/-1) online-accounts-service/signonui-service.cpp (+11/-16) online-accounts-service/ui-proxy.cpp (+20/-2) online-accounts-ui/browser-request.cpp (+2/-2) online-accounts-ui/dialog-request.cpp (+45/-8) online-accounts-ui/dialog.cpp (+20/-0) online-accounts-ui/dialog.h (+4/-1) online-accounts-ui/qml/DialogRequest.qml (+209/-88) online-accounts-ui/signonui-request.cpp (+7/-0) online-accounts-ui/ui-server.cpp (+1/-0) online-accounts-ui/ui.qrc (+2/-2) tests/online-accounts-ui/qml/Source/qmldir (+1/-1) tests/online-accounts-ui/qml/tst_DialogRequest.qml (+51/-6) |
| To merge this branch: | bzr merge lp://qastaging/~mardy/ubuntu-system-settings-online-accounts/fullscreen-dialog |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot | continuous-integration | Pending | |
| Online Accounts | Pending | ||
|
Review via email:
|
|||
Commit message
Implement 2FA, make UI prompt fullscreen
Description of the change
Implement 2FA, make UI prompt fullscreen
Unmerged revisions
- 354. By Alberto Mardegan
-
Merge from trunk
[ Alberto Mardegan ]
* Immediately accept degenerate requests from unconfined processes
(LP: #1582824)
* Replace incorrect usage of UbuntuColors (LP: #1581047)
* Update pot file for translations (LP: #1533091)
* Open popups in an overlaid webview (LP: #1428591)
* Skip tests on arm64 (LP: #1585942)
[ Alberto Mardegan, Timo Jyrinki ]
* Stop depending on transitional packages. (LP: #1583079) - 353. By Alberto Mardegan
-
Increase button height
- 352. By Alberto Mardegan
-
Add branding color, use #defines from signond
- 351. By Alberto Mardegan
-
fix
- 350. By Alberto Mardegan
-
Merge from trunk
[ Alberto Mardegan ]
* Allow configuring verbosity level from configuration file (LP:
#1570735)
* Use provider name as page title (LP: #1567435) - 349. By Alberto Mardegan
-
Increase top margin, use flickable
- 348. By Alberto Mardegan
-
Use provider name as window title
- 347. By Alberto Mardegan
-
Cancel timer in the right place
- 346. By Alberto Mardegan
-
return immediately after cancellation
- 345. By Alberto Mardegan
-
Increase margins, move register link to bottom
