lp:~nick-dedekind/ubuntu-system-settings/lp1336715.check.sync
Created by
Nick Dedekind
and last modified
- Get this branch:
- bzr branch lp:~nick-dedekind/ubuntu-system-settings/lp1336715.check.sync
Only
Nick Dedekind
can upload to this branch. If you are
Nick Dedekind
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
On hold
for merging
into
lp:ubuntu-system-settings/rtm-14.09
- Ken VanDine: Needs Fixing
-
Diff: 5170 lines (+1423/-1515) (has conflicts)69 files modifieddebian/changelog (+113/-0)
plugins/about/PageComponent.qml (+10/-3)
plugins/about/Storage.qml (+2/-2)
plugins/about/StorageItem.qml (+1/-1)
plugins/about/click.cpp (+11/-13)
plugins/about/click.h (+2/-1)
plugins/about/storageabout.cpp (+0/-11)
plugins/about/storageabout.h (+0/-1)
plugins/battery/PageComponent.qml (+15/-26)
plugins/battery/SleepValues.qml (+6/-1)
plugins/battery/battery.cpp (+5/-1)
plugins/battery/plugin/battery-plugin.cpp (+4/-1)
plugins/bluetooth/PageComponent.qml (+20/-19)
plugins/bluetooth/devicemodel.cpp (+2/-0)
plugins/brightness/BrightnessSlider.qml (+0/-103)
plugins/brightness/CMakeLists.txt (+0/-1)
plugins/brightness/PageComponent.qml (+39/-7)
plugins/cellular/Components/CMakeLists.txt (+5/-5)
plugins/cellular/Components/CellularSingleSim.qml (+0/-115)
plugins/cellular/Components/DataMultiSim.qml (+13/-124)
plugins/cellular/Components/MultiSim.qml (+52/-10)
plugins/cellular/Components/NoSim.qml (+5/-12)
plugins/cellular/Components/RadioSingleSim.qml (+57/-0)
plugins/cellular/Components/SimEditor.qml (+31/-14)
plugins/cellular/Components/SingleSim.qml (+42/-6)
plugins/cellular/CustomApnEditor.qml (+1/-1)
plugins/cellular/PageChooseCarrier.qml (+3/-2)
plugins/cellular/PageChooseCarriers.qml (+2/-2)
plugins/cellular/PageComponent.qml (+2/-2)
plugins/cellular/sims.js (+10/-0)
plugins/flight-mode/EntryComponent.qml (+3/-3)
plugins/language/DisplayLanguage.qml (+0/-2)
plugins/language/PageComponent.qml (+29/-21)
plugins/language/SpellChecking.qml (+12/-3)
plugins/notifications/PageComponent.qml (+1/-0)
plugins/orientation-lock/EntryComponent.qml (+6/-4)
plugins/phone/PageComponent.qml (+4/-2)
plugins/reset/ResetLauncherHome.qml (+0/-6)
plugins/security-privacy/Location.qml (+5/-4)
plugins/security-privacy/LockSecurity.qml (+1/-1)
plugins/security-privacy/PageComponent.qml (+10/-16)
plugins/security-privacy/PhoneLocking.qml (+11/-5)
plugins/sound/PageComponent.qml (+32/-19)
plugins/sound/sound.cpp (+3/-0)
plugins/system-update/PageComponent.qml (+5/-28)
plugins/time-date/PageComponent.qml (+5/-2)
plugins/wifi/MenuItemFactory.qml (+16/-9)
plugins/wifi/PageComponent.qml (+2/-1)
po/es.po (+3/-42)
po/hu.po (+35/-85)
po/pt.po (+10/-49)
po/ru.po (+96/-119)
src/CMakeLists.txt (+4/-1)
src/SystemSettings/CMakeLists.txt (+1/-0)
src/SystemSettings/SettingsItemTitle.qml (+38/-0)
src/SystemSettings/qmldir (+1/-0)
src/main.cpp (+1/-0)
src/utils.cpp (+17/-0)
src/utils.h (+8/-0)
tests/CMakeLists.txt (+2/-0)
tests/autopilot/ubuntu_system_settings/__init__.py (+198/-1)
tests/autopilot/ubuntu_system_settings/tests/__init__.py (+7/-3)
tests/autopilot/ubuntu_system_settings/tests/test_cellular.py (+202/-593)
tests/autopilot/ubuntu_system_settings/tests/test_wifi.py (+39/-2)
wizard/Utils/system.cpp (+7/-3)
wizard/qml/Components/CheckableSetting.qml (+8/-3)
wizard/qml/Pages/30-passwd-type.qml (+1/-1)
wizard/qml/Pages/50-location.qml (+95/-3)
wizard/qml/main.qml (+52/-0)
- Ken VanDine: Approve
- Sebastien Bacher (community): Needs Fixing
- PS Jenkins bot: Needs Fixing (continuous-integration)
-
Diff: 682 lines (+167/-138)15 files modifiedplugins/battery/PageComponent.qml (+14/-25)
plugins/bluetooth/PageComponent.qml (+9/-15)
plugins/brightness/PageComponent.qml (+4/-9)
plugins/cellular/Components/DataMultiSim.qml (+9/-7)
plugins/cellular/Components/SingleSim.qml (+13/-7)
plugins/flight-mode/EntryComponent.qml (+3/-3)
plugins/language/PageComponent.qml (+28/-21)
plugins/language/SpellChecking.qml (+12/-3)
plugins/orientation-lock/EntryComponent.qml (+6/-4)
plugins/phone/PageComponent.qml (+4/-2)
plugins/security-privacy/PageComponent.qml (+8/-14)
plugins/security-privacy/PhoneLocking.qml (+10/-4)
plugins/sound/PageComponent.qml (+28/-15)
plugins/sound/sound.cpp (+3/-0)
plugins/wifi/MenuItemFactory.qml (+16/-9)
Related bugs
Related blueprints
Branch information
Recent revisions
- 1151. By Michael Zanetti
-
update code to reset launcher after launcher backend implementation was reworked Fixes: 1376707
Approved by: Jonas G. Drange, PS Jenkins bot
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu-system-settings