Merge lp://qastaging/~azzar1/unity/lockscreen-warning-after-authentication into lp://qastaging/unity
Proposed by
Andrea Azzarone
| Status: | Merged |
|---|---|
| Approved by: | Marco Trevisan (Treviño) |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 4134 |
| Proposed branch: | lp://qastaging/~azzar1/unity/lockscreen-warning-after-authentication |
| Merge into: | lp://qastaging/unity |
| Prerequisite: | lp://qastaging/~azzar1/unity/option-lockscreen-account-checking |
| Diff against target: |
589 lines (+385/-14) 7 files modified
lockscreen/CMakeLists.txt (+1/-0) lockscreen/LockScreenButton.cpp (+148/-0) lockscreen/LockScreenButton.h (+70/-0) lockscreen/UserPromptView.cpp (+113/-13) lockscreen/UserPromptView.h (+9/-1) unity-shared/DashStyle.cpp (+39/-0) unity-shared/DashStyle.h (+5/-0) |
| To merge this branch: | bzr merge lp://qastaging/~azzar1/unity/lockscreen-warning-after-authentication |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Marco Trevisan (Treviño) | Approve | ||
| PS Jenkins bot | continuous-integration | Pending | |
|
Review via email:
|
|||
Commit message
Lockscreen: Make sure warning and errors are properly shown to the user
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Good stuff, thanks!