lp:~dbarth/ubuntu-system-settings/rtm-fix-1378678
Created by
David Barth
and last modified
- Get this branch:
- bzr branch lp:~dbarth/ubuntu-system-settings/rtm-fix-1378678
Only
David Barth
can upload to this branch. If you are
David Barth
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- Sebastien Bacher (community): Approve
- PS Jenkins bot: Approve (continuous-integration)
-
Diff: 76 lines (+15/-0)5 files modifiedplugins/system-update/PageComponent.qml (+5/-0)
plugins/system-update/update_manager.cpp (+4/-0)
plugins/system-update/update_manager.h (+1/-0)
tests/plugins/system-update/fakessoservice.cpp (+2/-0)
tests/plugins/system-update/fakessoservice.h (+3/-0)
- Ubuntu Touch System Settings: Pending requested
-
Diff: 77017 lines (+62935/-593) (has conflicts)91 files modifiedCMakeLists.txt (+24/-10)
debian/changelog (+949/-0)
debian/control (+32/-0)
plugins/about/PageComponent.qml (+9/-0)
plugins/about/Storage.qml (+11/-0)
plugins/about/click.cpp (+56/-0)
plugins/about/click.h (+6/-0)
plugins/about/storageabout.cpp (+10/-1)
plugins/about/storageabout.h (+7/-0)
plugins/bluetooth/PageComponent.qml (+170/-0)
plugins/bluetooth/agent.cpp (+4/-0)
plugins/bluetooth/agentadaptor.h (+1/-1)
plugins/bluetooth/bluetooth.cpp (+31/-0)
plugins/bluetooth/bluetooth.h (+4/-0)
plugins/bluetooth/devicemodel.cpp (+12/-0)
plugins/cellular/Components/DataMultiSim.qml (+9/-1)
plugins/cellular/Components/NoSim.qml (+47/-0)
plugins/cellular/Components/RadioSingleSim.qml (+90/-0)
plugins/cellular/Components/SimEditor.qml (+24/-0)
plugins/cellular/CustomApnEditor.qml (+328/-0)
plugins/language/PageComponent.qml (+17/-0)
plugins/phone/MultiSim.qml (+138/-0)
plugins/phone/PageComponent.qml (+28/-0)
plugins/security-privacy/LockSecurity.qml (+61/-0)
plugins/security-privacy/PhoneLocking.qml (+4/-0)
plugins/security-privacy/SimPin.qml (+392/-0)
plugins/sound/PageComponent.qml (+31/-0)
plugins/system-update/PageComponent.qml (+479/-2)
plugins/system-update/download_tracker.cpp (+23/-4)
plugins/system-update/download_tracker.h (+9/-0)
plugins/system-update/network/network.cpp (+39/-0)
plugins/wifi/NetworkDetails.qml (+5/-0)
plugins/wifi/NetworkDetailsBrief.qml (+82/-0)
plugins/wifi/OtherNetwork.qml (+387/-116)
plugins/wifi/PageComponent.qml (+17/-0)
po/CMakeLists.txt (+4/-0)
po/am.po (+2790/-1)
po/be.po (+2702/-6)
po/ca.po (+2794/-13)
po/ca@valencia.po (+3029/-0)
po/de.po (+2916/-8)
po/el.po (+2780/-3)
po/en_AU.po (+2764/-6)
po/es.po (+328/-57)
po/fa.po (+196/-56)
po/fr.po (+927/-57)
po/gl.po (+2709/-14)
po/he.po (+2700/-49)
po/hu.po (+2682/-17)
po/is.po (+1012/-54)
po/it.po (+2876/-6)
po/pa.po (+2747/-2)
po/pl.po (+2872/-3)
po/pt.po (+2798/-1)
po/ro.po (+1285/-0)
po/ru.po (+2781/-17)
po/tr.po (+2858/-1)
po/ubuntu-system-settings.pot (+2897/-32)
po/zh_CN.po (+2752/-0)
po/zh_TW.po (+2160/-54)
push-helper/software_updates_helper.py (+154/-0)
src/qml/CategoryGrid.qml (+4/-0)
tests/autopilot/ubuntu_system_settings/__init__.py (+557/-0)
tests/autopilot/ubuntu_system_settings/tests/__init__.py (+45/-1)
tests/autopilot/ubuntu_system_settings/tests/test_datetime.py (+5/-0)
tests/autopilot/ubuntu_system_settings/tests/test_wifi.py (+162/-0)
wizard/CMakeLists.txt.OTHER (+51/-0)
wizard/PageList.cpp.OTHER (+111/-0)
wizard/Utils/CMakeLists.txt.OTHER (+27/-0)
wizard/Utils/plugin.cpp.OTHER (+41/-0)
wizard/Utils/system.cpp (+114/-0)
wizard/Utils/system.h (+57/-0)
wizard/main.cpp.OTHER (+93/-0)
wizard/qml/Components/CheckableSetting.qml (+80/-0)
wizard/qml/Components/Page.qml.OTHER (+107/-0)
wizard/qml/Components/StackButton.qml.OTHER (+54/-0)
wizard/qml/Pages/10-welcome.qml.OTHER (+93/-0)
wizard/qml/Pages/20-sim.qml.OTHER (+75/-0)
wizard/qml/Pages/30-passwd-type.qml.OTHER (+119/-0)
wizard/qml/Pages/40-wifi.qml.OTHER (+216/-0)
wizard/qml/Pages/50-location.qml (+96/-0)
wizard/qml/Pages/60-reporting.qml.OTHER (+52/-0)
wizard/qml/Pages/80-finished.qml.OTHER (+55/-0)
wizard/qml/Pages/here-terms.qml (+117/-0)
wizard/qml/Pages/passwd-confirm.qml (+79/-0)
wizard/qml/Pages/passwd-set.qml (+87/-0)
wizard/qml/main.qml.OTHER (+246/-0)
wizard/test.sh.OTHER (+18/-0)
wizard/ubuntu-system-settings-wizard-cleanup.conf.OTHER (+20/-0)
wizard/ubuntu-system-settings-wizard-set-lang.conf (+30/-0)
wizard/ubuntu-system-settings-wizard.conf.OTHER (+75/-0)
Related source package recipes
Related bugs
Related blueprints
Branch information
Recent revisions
- 998. By David Barth
-
cherry picking the fix for bug #1378678, ie prompting the user when older u1 accounts are deleted by the system
- 996. By Michael Terry
-
Wait for libqofono to finish initializing before we decide whether to skip the wizard's SIM page or not.
libqofono recently became asynchronous, which the wizard was not prepared for. Fixes: #1423565
Approved by: Jonas G. Drange - 994. By Ken VanDine
-
Removed conflicting ConnectivityMixin to fix smoke testing
Fixes: #1423205
Approved by: Jonas G. Drange - 992. By Mathieu Trudel-Lapierre
-
Use the address instead of name in main device list if name isn't available.
Approved by: Ken VanDine - 990. By Jonas G. Drange
-
[cellular] makes the apn editor somewhat compatible to libqofono 0.7 Fixes: #1379850
- 989. By Jonas G. Drange
-
[cellular] using libqofono-0.7 and including functionality for enabling users to change what modem has 3G Fixes: #1379850
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
