Merge lp://qastaging/~nick-dedekind/ubuntu-system-settings/lp1336715.check.sync into lp://qastaging/ubuntu-system-settings/rtm-14.09
Proposed by
kevin gunn
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://qastaging/~nick-dedekind/ubuntu-system-settings/lp1336715.check.sync |
| Merge into: | lp://qastaging/ubuntu-system-settings/rtm-14.09 |
| Diff against target: |
5170 lines (+1423/-1515) (has conflicts) 69 files modified
debian/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) Text conflict in debian/changelog Text conflict in plugins/about/PageComponent.qml Text conflict in po/ru.po Text conflict in wizard/qml/Pages/50-location.qml |
| To merge this branch: | bzr merge lp://qastaging/~nick-dedekind/ubuntu-system-settings/lp1336715.check.sync |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ken VanDine | Needs Fixing | ||
|
Review via email:
|
|||
Commit message
Fixed switches & check-boxes going out of sync with backends.
Description of the change
Fixed switches & check-boxes going out of sync with backends.
To post a comment you must log in.
Revision history for this message
| Sebastien Bacher (seb128) wrote | # |
Unmerged revisions
- 1160. By Nick Dedekind
-
more fixes
- 1159. By Nick Dedekind
-
merged with trunk
- 1158. By Nick Dedekind
-
reverted unnecessary changes
- 1157. By Nick Dedekind
-
dont use USC.SyncSwitch
- 1156. By Nick Dedekind
-
removed unnecessary change
- 1155. By Nick Dedekind
-
bump usc requirement
- 1154. By Nick Dedekind
-
fixed out of sync switches
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Please create a new branch based on lp:ubuntu-system-settings/rtm-14.09 and merge just the commits from trunk into your new branch. Then propose that branch.
For example:
bzr branch lp:ubuntu-system-settings/rtm-14.09
cd rtm-14.09
bzr merge lp:ubuntu-system-settings -r 1187..1189
However that will still conflict slightly, you'll need to manually merge 2 files because they have diverged too much between trunk and rtm at this point.