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

Branch merges

Propose for merging

No branches dependent on this one.

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

Jonas G. Drange (community): Approve on 2014-08-25

Diff: 28 lines (+3/-0)

2 files modified

plugins/security-privacy/PageComponent.qml (+2/-0)
plugins/security-privacy/PhoneLocking.qml (+1/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1361297: [Security & Privacy] 'Sleep locks immediately' isn't set properly and doesn't persist

High

Fix Released

Link a bug report

Related blueprints

938. By Ken VanDine on 2014-08-26

[security-privacy] Hide encryption setting until it's implemented

937. By Ken VanDine on 2014-08-25

Hide sleep locks immediately setting, it isn't implemented yet (LP: #1361297)

936. By Launchpad Translations on behalf of system-settings-touch on 2014-08-25

Launchpad automatic translations update.

935. By Launchpad Translations on behalf of system-settings-touch on 2014-08-24

Launchpad automatic translations update.

934. By Launchpad Translations on behalf of system-settings-touch on 2014-08-23

Launchpad automatic translations update.

933. By PS Jenkins bot on 2014-08-22

Releasing 0.3+14.10.20140822.1-0ubuntu1

932. By Jonas G. Drange on 2014-08-22

[cellular] displays cellular UIs based on how many SIMs are present. Fixes: 1357393
Approved by: Ken VanDine, PS Jenkins bot

931. By Jussi Pakkanen on 2014-08-22

Fix a bunch of compiler warnings.
Approved by: Iain Lane, PS Jenkins bot

930. By Ken VanDine on 2014-08-22

Added flickable to fix scrolling
 Fixes: 1354161, 1355144
Approved by: Sebastien Bacher, PS Jenkins bot

929. By Ken VanDine on 2014-08-22

Settings for idle/lock timeout Fixes: 1230345
Approved by: Jonas G. Drange, Sebastien Bacher, PS Jenkins bot