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

Branch merges

Propose for merging

No branches dependent on this one.

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

PS Jenkins bot: Approve (continuous-integration) on 2014-09-16

Mathieu Trudel-Lapierre (community): Approve on 2014-09-16

Diff: 26 lines (+2/-1)

2 files modified

CMakeLists.txt (+1/-0)
ubuntu-system-settings.desktop.in.in (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1365408: Should ship a PNG icon instead of using the theme

High

Fix Released

Link a bug report

Related blueprints

1052. By Ken VanDine on 2014-09-16

Include an icon instead of using the themed icon (LP: #1365408)

1051. By PS Jenkins bot on 2014-09-15

Releasing 0.3+14.10.20140915.1-0ubuntu1

1050. By Ken VanDine on 2014-09-15

When activated by a url request for a specific panel, clear the pageStack
to maintain the natural navigation instead of pushing a new page on top of a
page from a the previous panel (LP: #1362025) Fixes: 1359953, 1362025
Approved by: Sebastien Bacher, PS Jenkins bot

1049. By Lars Karlitski on 2014-09-15

Use Icon instead of StatusIcon

The latter is deprecated. Fixes: 1343553
Approved by: Sebastien Bacher, PS Jenkins bot

1048. By PS Jenkins bot on 2014-09-15

Releasing 0.3+14.10.20140915-0ubuntu1

1047. By John Lenton on 2014-09-15

Take the system settings push helper closer to implementing the spec at https://wiki.ubuntu.com/SoftwareUpdates#Prompting Fixes: 1363972
Approved by: Sebastien Bacher, Roberto Alsina

1046. By Launchpad Translations on behalf of system-settings-touch on 2014-09-15

Launchpad automatic translations update.

1045. By PS Jenkins bot on 2014-09-14

Resync trunk

1044. By PS Jenkins bot on 2014-09-13

Releasing 0.3+14.10.20140913-0ubuntu1

1043. By Ken VanDine on 2014-09-13

Don't try to tweak the bottomMargin for the OSK, it was trying to calculate
it based on an undefined component so failing. It shouldn't be needed anyway.

Put the buttons in the Column.
Approved by: Jonas G. Drange