Merge lp://staging/~nick-dedekind/ubuntu-settings-components/indicator-color-fixes into lp://staging/~registry/ubuntu-settings-components/trunk
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Albert Astals Cid | ||||
Approved revision: | 113 | ||||
Merged at revision: | 105 | ||||
Proposed branch: | lp://staging/~nick-dedekind/ubuntu-settings-components/indicator-color-fixes | ||||
Merge into: | lp://staging/~registry/ubuntu-settings-components/trunk | ||||
Prerequisite: | lp://staging/~aacid/ubuntu-settings-components/standarizeImports | ||||
Diff against target: |
460 lines (+197/-24) 17 files modified
debian/changelog (+7/-0) examples/OtherComponents.qml (+22/-0) examples/SettingsComponents.qml (+1/-1) plugins/Ubuntu/Settings/Components/ActionTextField.qml (+1/-1) plugins/Ubuntu/Settings/Components/Calendar.qml (+3/-3) plugins/Ubuntu/Settings/Components/MessageHeader.qml (+2/-2) plugins/Ubuntu/Settings/Menus/AccessPointMenu.qml (+3/-3) plugins/Ubuntu/Settings/Menus/EventMenu.qml (+1/-1) plugins/Ubuntu/Settings/Menus/ModemInfoItem.qml (+128/-0) plugins/Ubuntu/Settings/Menus/PlaybackItemMenu.qml (+6/-6) plugins/Ubuntu/Settings/Menus/SectionMenu.qml (+1/-0) plugins/Ubuntu/Settings/Menus/SliderMenu.qml (+2/-2) plugins/Ubuntu/Settings/Menus/SnapDecisionMenu.qml (+1/-1) plugins/Ubuntu/Settings/Menus/StandardMenu.qml (+1/-1) plugins/Ubuntu/Settings/Menus/TransferMenu.qml (+1/-1) plugins/Ubuntu/Settings/Menus/qmldir (+1/-0) po/ubuntu-settings-components.pot (+16/-2) |
||||
To merge this branch: | bzr merge lp://staging/~nick-dedekind/ubuntu-settings-components/indicator-color-fixes | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Albert Astals Cid (community) | Approve | ||
Unity8 CI Bot (community) | continuous-integration | Approve | |
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Lukáš Tinkl (community) | Abstain | ||
Zsombor Egri | Pending | ||
Review via email: mp+285702@code.staging.launchpad.net |
This proposal supersedes a proposal from 2016-01-27.
Commit message
Fixed colors palette value set & updated imports. Moved ModemItem from u8.
Description of the change
* Are there any related MPs required for this MP to build/function as expected? Please list.
https:/
https:/
* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes
* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A
* If you changed the UI, has there been a design review?
N/A
FAILED: Continuous integration, rev:108 jenkins. qa.ubuntu. com/job/ ubuntu- settings- components- ci/122/ jenkins. qa.ubuntu. com/job/ ubuntu- settings- components- qmltests- vivid/47 jenkins. qa.ubuntu. com/job/ ubuntu- settings- components- vivid-amd64- ci/29 jenkins. qa.ubuntu. com/job/ ubuntu- settings- components- vivid-armhf- ci/29 jenkins. qa.ubuntu. com/job/ ubuntu- settings- components- vivid-armhf- ci/29/artifact/ work/output/ *zip*/output. zip
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/ubuntu- settings- components- ci/122/ rebuild
http://