← Back to branch summary

~nick-dedekind/ubuntu-system-settings/lp1336715.check.sync

~nick-dedekind/ubuntu-system-settings/lp1336715.check.sync

Viewing all changes in revision 1159.

Committer: Nick Dedekind
Date: 2014-11-04 12:08:12 UTC
mfrom: (1153.1.29 ubuntu-system-settings)
Revision ID: nick.dedekind@canonical.com-20141104120812-xy1yrfdu4qi99ei4

merged with trunk

files added:
plugins/cellular/Components/RadioSingleSim.qml

src/SystemSettings/SettingsItemTitle.qml

files removed:
plugins/brightness/BrightnessSlider.qml

plugins/cellular/Components/CellularSingleSim.qml

files renamed:
plugins/cellular/Components/CellularMultiSim.qml => plugins/cellular/Components/DataMultiSim.qml

wizard/qml/Pages/31-passwd-set.qml => wizard/qml/Pages/passwd-set.qml

files modified:
debian/changelog

debian/control

plugins/about/PageComponent.qml

plugins/about/Storage.qml

plugins/about/StorageItem.qml

plugins/about/click.cpp

plugins/about/click.h

plugins/about/storageabout.cpp

plugins/about/storageabout.h

plugins/battery/PageComponent.qml

plugins/battery/SleepValues.qml

plugins/battery/battery.cpp

plugins/battery/battery.settings

plugins/battery/plugin/battery-plugin.cpp

plugins/bluetooth/PageComponent.qml

plugins/bluetooth/devicemodel.cpp

plugins/brightness/CMakeLists.txt

plugins/brightness/PageComponent.qml

plugins/cellular/Components/CMakeLists.txt

plugins/cellular/Components/MultiSim.qml

plugins/cellular/Components/NoSim.qml

plugins/cellular/Components/SimEditor.qml

plugins/cellular/Components/SingleSim.qml

plugins/cellular/CustomApnEditor.qml

plugins/cellular/PageChooseCarrier.qml

plugins/cellular/PageChooseCarriers.qml

plugins/cellular/PageComponent.qml

plugins/cellular/sims.js

plugins/language/DisplayLanguage.qml

plugins/language/PageComponent.qml

plugins/notifications/PageComponent.qml

plugins/reset/ResetLauncherHome.qml

plugins/security-privacy/Location.qml

plugins/security-privacy/LockSecurity.qml

plugins/security-privacy/PageComponent.qml

plugins/security-privacy/PhoneLocking.qml

plugins/sound/PageComponent.qml

plugins/system-update/CMakeLists.txt

plugins/system-update/EntryComponent.qml

plugins/system-update/PageComponent.qml

plugins/system-update/plugin.cpp

plugins/system-update/plugin/CMakeLists.txt

plugins/system-update/plugin/update-plugin.cpp

plugins/system-update/system_update.cpp

plugins/system-update/update_manager.cpp

plugins/system-update/update_manager.h

plugins/time-date/PageComponent.qml

plugins/wifi/PageComponent.qml

po/am.po

po/ca.po

po/ca@valencia.po

po/de.po

po/es.po

po/fi.po

po/fr.po

po/gl.po

po/hu.po

po/nl.po

po/pt.po

po/ru.po

src/CMakeLists.txt

src/SystemSettings/CMakeLists.txt

src/SystemSettings/qmldir

src/item-model.cpp

src/main.cpp

src/plugin.cpp

src/qml/CategoryGrid.qml

src/qml/UncategorizedItemsView.qml

src/utils.cpp

src/utils.h

tests/CMakeLists.txt

tests/autopilot/ubuntu_system_settings/__init__.py

tests/autopilot/ubuntu_system_settings/tests/__init__.py

tests/autopilot/ubuntu_system_settings/tests/test_cellular.py

tests/autopilot/ubuntu_system_settings/tests/test_wifi.py

tests/plugins/system-update/CMakeLists.txt

tests/plugins/system-update/fakenetwork.h

tests/plugins/system-update/fakesystemupdate.h

tests/plugins/system-update/tst_updatemanager.cpp

wizard/Utils/system.cpp

wizard/qml/Components/CheckableSetting.qml

wizard/qml/Components/StackButton.qml

wizard/qml/Pages/30-passwd-type.qml

wizard/qml/Pages/50-location.qml

wizard/qml/Pages/here-terms.qml

wizard/qml/Pages/passwd-confirm.qml

wizard/qml/main.qml

Show diffs side-by-side

added added

removed removed

debian/changelog

plugins/about/PageComponent.qml

plugins/about/Storage.qml

plugins/about/StorageItem.qml

plugins/about/click.cpp

plugins/about/click.h

plugins/about/storageabout.cpp

plugins/about/storageabout.h

plugins/battery/PageComponent.qml

plugins/battery/SleepValues.qml

plugins/battery/battery.cpp

plugins/battery/battery.settings

plugins/battery/plugin/battery-plugin.cpp

plugins/bluetooth/PageComponent.qml

plugins/bluetooth/devicemodel.cpp

plugins/brightness/BrightnessSlider.qml

plugins/brightness/CMakeLists.txt

plugins/brightness/PageComponent.qml

plugins/cellular/Components/CMakeLists.txt

plugins/cellular/Components/CellularSingleSim.qml

plugins/cellular/Components/DataMultiSim.qml

plugins/cellular/Components/MultiSim.qml

plugins/cellular/Components/NoSim.qml

plugins/cellular/Components/RadioSingleSim.qml

plugins/cellular/Components/SimEditor.qml

plugins/cellular/Components/SingleSim.qml

plugins/cellular/CustomApnEditor.qml

plugins/cellular/PageChooseCarrier.qml

plugins/cellular/PageChooseCarriers.qml

plugins/cellular/PageComponent.qml

plugins/cellular/sims.js

plugins/language/DisplayLanguage.qml

plugins/language/PageComponent.qml

plugins/notifications/PageComponent.qml

plugins/reset/ResetLauncherHome.qml

plugins/security-privacy/Location.qml

plugins/security-privacy/LockSecurity.qml

plugins/security-privacy/PageComponent.qml

plugins/security-privacy/PhoneLocking.qml

plugins/sound/PageComponent.qml

plugins/system-update/CMakeLists.txt

plugins/system-update/EntryComponent.qml

plugins/system-update/PageComponent.qml

plugins/system-update/plugin.cpp

plugins/system-update/plugin/CMakeLists.txt

plugins/system-update/plugin/update-plugin.cpp

plugins/system-update/system_update.cpp

plugins/system-update/update_manager.cpp

plugins/system-update/update_manager.h

plugins/time-date/PageComponent.qml

plugins/wifi/PageComponent.qml

po/ca@valencia.po

src/CMakeLists.txt

src/SystemSettings/CMakeLists.txt

src/SystemSettings/SettingsItemTitle.qml

src/SystemSettings/qmldir

src/item-model.cpp

src/qml/CategoryGrid.qml

src/qml/UncategorizedItemsView.qml

tests/CMakeLists.txt

tests/autopilot/ubuntu_system_settings/__init__.py

tests/autopilot/ubuntu_system_settings/tests/__init__.py

tests/autopilot/ubuntu_system_settings/tests/test_cellular.py

tests/autopilot/ubuntu_system_settings/tests/test_wifi.py

tests/plugins/system-update/CMakeLists.txt

tests/plugins/system-update/fakenetwork.h

tests/plugins/system-update/fakesystemupdate.h

tests/plugins/system-update/tst_updatemanager.cpp

wizard/Utils/system.cpp

wizard/qml/Components/CheckableSetting.qml

wizard/qml/Components/StackButton.qml

wizard/qml/Pages/30-passwd-type.qml

wizard/qml/Pages/50-location.qml

wizard/qml/Pages/here-terms.qml

wizard/qml/Pages/passwd-confirm.qml

wizard/qml/Pages/passwd-set.qml

wizard/qml/main.qml

Older »