Merge lp:~renatofilho/address-book-app/fix-1332124 into lp:~phablet-team/address-book-app/staging
Proposed by
Renato Araujo Oliveira Filho
Status: | Merged |
---|---|
Approved by: | Gustavo Pichorim Boiko |
Approved revision: | 214 |
Merged at revision: | 215 |
Proposed branch: | lp:~renatofilho/address-book-app/fix-1332124 |
Merge into: | lp:~phablet-team/address-book-app/staging |
Prerequisite: | lp:~renatofilho/address-book-app/new-avatar-empty-icon-on-edit-mode |
Diff against target: |
59 lines (+11/-7) 2 files modified
src/imports/ContactEdit/ValueSelector.qml (+2/-3) src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml (+9/-4) |
To merge this branch: | bzr merge lp:~renatofilho/address-book-app/fix-1332124 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Approve | |
Gustavo Pichorim Boiko | Pending | ||
Review via email:
|
This proposal supersedes a proposal from 2014-07-08.
Commit message
Fixed phone context parser based on Evolution types.
In evolution database these are the correct values:
Mobbile = Context: "home" SubType: "cell"
Work Mobbile = Context: "work" SubType: "cell"
Home = Context: "home" SubType: "voice"
Work = Context: "work" SubType: "voice"
Other = Context: "other" SubType: "voice"
To post a comment you must log in.
FAILED: Continuous integration, rev:213 jenkins. qa.ubuntu. com/job/ phablet- team-address- book-app- staging- ci/213/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- utopic- touch/1719 jenkins. qa.ubuntu. com/job/ generic- mediumtests- utopic/ 1454 jenkins. qa.ubuntu. com/job/ phablet- team-address- book-app- staging- utopic- amd64-ci/ 213 jenkins. qa.ubuntu. com/job/ phablet- team-address- book-app- staging- utopic- armhf-ci/ 213 jenkins. qa.ubuntu. com/job/ phablet- team-address- book-app- staging- utopic- armhf-ci/ 213/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ phablet- team-address- book-app- staging- utopic- i386-ci/ 213 jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- runner- mako/1982 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/2764 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/2764/ artifact/ work/output/ *zip*/output. zip s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 9493 jenkins. qa.ubuntu. com/job/ autopilot- testrunner- otto-utopic/ 1212 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- amd64/1623 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- amd64/1623/ artifact/ work/output/ *zip*/output. zip
http://
Executed test runs:
UNSTABLE: http://
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/phablet- team-address- book-app- staging- ci/213/ rebuild
http://