lp:~ken-vandine/ubuntu-system-settings/lp1581423

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu-system-settings at revision 1657

Jonas G. Drange (community): Approve on 2016-05-16

PS Jenkins bot: Pending (continuous-integration) requested 2016-05-13

Diff: 64 lines (+22/-12)

2 files modified

plugins/battery/PageComponent.qml (+9/-4)
plugins/security-privacy/PhoneLocking.qml (+13/-8)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1581423: After setting "lock when idle "after 30 seconds,it is still displayed as "1 minute" .

Medium

Fix Released

Link a bug report

Related blueprints

1656. By Ken VanDine on 2016-05-16

Removed gps switch that was already removed in trunk

1655. By Ken VanDine on 2016-05-13

Sleep timeout fixes from Pat

1654. By CI Train Bot Account on 2016-05-10

Releasing 0.3+16.04.20160510-0ubuntu1

1653. By Ken VanDine on 2016-05-10

Don't use Ip4Address from NetworkManager, it was deprecated since 0.9 and since removed. Use QNetworkInterface to get the IP address. Fixes: #1579825

1652. By CI Train Bot Account on 2016-05-06

Releasing 0.3+16.04.20160506-0ubuntu1

1651. By Jonas G. Drange on 2016-05-06

add servicewatcher to system image binding Fixes: #1509022
Approved by: Ken VanDine

1650. By Jonas G. Drange on 2016-05-06

* Set Preferred on some context as soon as we know it's type and it is active.
* Do not copy the Manager instance from panel to panel. Fixes: #1537913
Approved by: Ken VanDine

1649. By CI Train Bot Account on 2016-05-03

Releasing 0.3+16.04.20160503-0ubuntu1

1648. By Ken VanDine on 2016-05-03

Only hide ringer sound settings when there is no modem, IncomingMessageSound is used by ubuntu-push for other generic notifications
 Fixes: #1577783

1647. By CI Train Bot Account on 2016-04-29

Releasing 0.3+16.04.20160429.2-0ubuntu1