Merge lp://qastaging/~renatofilho/address-book-app/fix-1450252 into lp://qastaging/address-book-app

Proposed by Renato Araujo Oliveira Filho
Status: Superseded
Proposed branch: lp://qastaging/~renatofilho/address-book-app/fix-1450252
Merge into: lp://qastaging/address-book-app
Diff against target: 444 lines (+161/-25)
17 files modified
src/imports/ABContactListPage.qml (+3/-0)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactEditorPage.qml (+2/-1)
src/imports/Ubuntu/AddressBook/ContactEditor/TextInputDetail.qml (+0/-1)
src/imports/Ubuntu/AddressBook/ContactView/BasicFieldView.qml (+0/-1)
src/imports/Ubuntu/Contacts/CMakeLists.txt (+1/-0)
src/imports/Ubuntu/Contacts/ContactAvatar.qml (+19/-7)
src/imports/Ubuntu/Contacts/ContactDelegate.qml (+1/-1)
src/imports/Ubuntu/Contacts/ContactDetailPickerPhoneNumberDelegate.qml (+0/-2)
src/imports/Ubuntu/Contacts/ContactListButtonDelegate.qml (+0/-1)
src/imports/Ubuntu/Contacts/Contacts.js (+7/-0)
src/imports/Ubuntu/Contacts/FastScroll.qml (+20/-5)
src/imports/Ubuntu/Contacts/ListItemWithActions.qml (+1/-1)
src/imports/Ubuntu/Contacts/SIMCardImportPage.qml (+30/-4)
src/imports/Ubuntu/Contacts/Triangle.qml (+52/-0)
src/imports/Ubuntu/Contacts/contacts.cpp (+16/-0)
src/imports/Ubuntu/Contacts/contacts.h (+2/-0)
tests/qml/tst_ContactAvatar.qml (+7/-1)
To merge this branch: bzr merge lp://qastaging/~renatofilho/address-book-app/fix-1450252
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team Pending
Review via email: mp+284907@code.qastaging.launchpad.net

This proposal has been superseded by a proposal from 2016-02-03.

Commit message

Make sure the import page still visible while importing contacts from sim.

To post a comment you must log in.
536. By Renato Araujo Oliveira Filho

Add debug messages.

537. By Renato Araujo Oliveira Filho

Pop import contacts from sim page on import complet.

538. By Renato Araujo Oliveira Filho

Parent merged.

539. By Renato Araujo Oliveira Filho

Removed debug messages.

540. By Renato Araujo Oliveira Filho

Remove debug messages.

541. By Renato Araujo Oliveira Filho

Trunk merged.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches