lp:~mterry/unity8/dialer-above

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:unity8 at revision 1062

Seth Arnold (community): Approve on 2014-07-17

PS Jenkins bot (community): Needs Fixing (continuous-integration) on 2014-07-17

Nick Dedekind (community): Approve on 2014-07-17

Albert Astals Cid: Pending requested 2014-07-11

Marc Deslauriers: Pending requested 2014-07-11

Diff: 677 lines (+343/-48)

9 files modified

qml/Components/Lockscreen.qml (+17/-5)
qml/Greeter/Greeter.qml (+1/-1)
qml/Shell.qml (+85/-28)
qml/Stages/PhoneStage.qml (+13/-1)
tests/mocks/LightDM/single-pin/GreeterPrivate.cpp (+1/-9)
tests/qmltests/CMakeLists.txt (+3/-3)
tests/qmltests/Greeter/tst_Lockscreen.qml (+1/-1)
tests/qmltests/tst_Shell.qml (+19/-0)
tests/qmltests/tst_ShellWithPin.qml (+203/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

992. By Michael Terry on 2014-07-18

Merge from trunk

991. By Michael Terry on 2014-07-17

Add some more braces for single-line ifs

990. By Michael Terry on 2014-07-15

Only enable greeter drag area if greeter is also enabled (I keep forgetting that isn't automatic)

989. By Michael Terry on 2014-07-15

Fix qmluitest

988. By Michael Terry on 2014-07-15

Set mock lightdm for PhoneStage test

987. By Michael Terry on 2014-07-11

Merge from show-greeter-dbus

986. By Michael Terry on 2014-07-02

Fix qmluitest

985. By Michael Terry on 2014-07-01

Disable emergency call button on wider devices (tablets)

984. By Michael Terry on 2014-06-30

Add some tests

983. By Michael Terry on 2014-06-30

Rename mock phone-app to dialer-app, to match modern usage and this branch's hard-coding of the name for the dialer