lp:~ted/indicator-network/phone-settings

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:indicator-network/13.10 at revision 283

Lars Karlitski (community): Approve on 2013-09-16

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

Diff: 626 lines (+391/-25)

13 files modified

CMakeLists.txt (+1/-0)
cmake/UseGSettings.cmake (+42/-0)
data/CMakeLists.txt (+6/-1)
data/com.canonical.indicator.network (+3/-0)
data/com.canonical.indicator.network.gschema.xml (+18/-0)
network/CMakeLists.txt (+19/-0)
network/device-wifi.vala (+14/-6)
network/network-menu.vala (+89/-18)
network/settings-airplane.vala (+45/-0)
network/settings-base.vala (+98/-0)
network/settings-wifi.vala (+50/-0)
po/POTFILES.in (+3/-0)
po/POTFILES.skip (+3/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

297. By Ted Gould on 2013-09-16

Merge in trunk

296. By Ted Gould on 2013-09-16

Use the settings to build the actions

295. By Ted Gould on 2013-09-16

Grab the GSettings rules

294. By Ted Gould on 2013-09-16

Add in a GSchema for the preferences we need

293. By Ted Gould on 2013-09-16

Fix ap sorting

292. By Ted Gould on 2013-09-13

Remove the settings item from the settings menu. Duh.

291. By Ted Gould on 2013-09-13

Make it possible for the items to not have root menu items

290. By Ted Gould on 2013-09-06

Typo

289. By Ted Gould on 2013-09-06

Sync to trunk (switch build systems)

288. By Ted Gould on 2013-08-27

Make the message a little nicer