Merge lp://staging/dialer-app/staging into lp://staging/dialer-app
Status: | Approved |
---|---|
Approved by: | Gustavo Pichorim Boiko |
Approved revision: | 559 |
Proposed branch: | lp://staging/dialer-app/staging |
Merge into: | lp://staging/dialer-app |
Diff against target: |
4385 lines (+2739/-259) 63 files modified
CMakeLists.txt (+1/-0) TODO (+1/-0) accounts/CMakeLists.txt (+2/-0) accounts/dialer-app.application (+12/-0) debian/dialer-app.install (+2/-0) po/dialer-app.pot (+253/-111) src/dialer-app.desktop.in.in (+0/-1) src/qml/AccountsModel.qml (+1/-1) src/qml/CMakeLists.txt (+1/-0) src/qml/ContactsPage/ContactsPage.qml (+1/-1) src/qml/ContactsPage/KeyboardRectagle.qml (+1/-1) src/qml/DialerPage/CallButton.qml (+1/-1) src/qml/DialerPage/CustomButton.qml (+1/-1) src/qml/DialerPage/DialerBottomEdge.qml (+1/-1) src/qml/DialerPage/DialerPage.qml (+67/-14) src/qml/DialerPage/Keypad.qml (+108/-34) src/qml/DialerPage/KeypadButton.qml (+20/-20) src/qml/DialerPage/KeypadEntry.qml (+34/-6) src/qml/Dialogs/DisableFlightModeDialog.qml (+1/-1) src/qml/Dialogs/FlightModeProgressDialog.qml (+1/-1) src/qml/Dialogs/NoDefaultSIMCardDialog.qml (+1/-1) src/qml/Dialogs/NotificationDialog.qml (+1/-1) src/qml/Dialogs/SetDefaultSIMCardDialog.qml (+1/-1) src/qml/Dialogs/SimLockedDialog.qml (+1/-1) src/qml/Dialogs/UssdErrorDialog.qml (+1/-1) src/qml/Dialogs/UssdProgressDialog.qml (+1/-1) src/qml/Dialogs/UssdResponseDialog.qml (+1/-1) src/qml/HistoryPage/ExpandableButton.qml (+1/-1) src/qml/HistoryPage/HistoryDelegate.qml (+1/-1) src/qml/HistoryPage/HistoryDetailsPage.qml (+1/-1) src/qml/HistoryPage/HistoryPage.qml (+11/-2) src/qml/HistoryPage/SwipeItemDemo.qml (+1/-1) src/qml/InputInfo.qml (+1/-1) src/qml/LiveCallPage/ConferenceCallDisplay.qml (+1/-1) src/qml/LiveCallPage/HangupButton.qml (+1/-1) src/qml/LiveCallPage/LiveCall.qml (+56/-35) src/qml/LiveCallPage/LiveCallKeypadButton.qml (+1/-1) src/qml/LiveCallPage/MultiCallDisplay.qml (+1/-1) src/qml/LiveCallPage/StopWatch.qml (+1/-1) src/qml/MMI/IMEI.qml (+1/-1) src/qml/MMI/IMEIDialog.qml (+1/-1) src/qml/SettingsPage/AccountSettings/CMakeLists.txt (+6/-0) src/qml/SettingsPage/AccountSettings/SipNumberRewrite.qml (+177/-0) src/qml/SettingsPage/AccountSettings/sip.qml (+30/-0) src/qml/SettingsPage/CMakeLists.txt (+8/-0) src/qml/SettingsPage/CallForwardItem.qml (+240/-0) src/qml/SettingsPage/CallForwarding.qml (+393/-0) src/qml/SettingsPage/CallWaiting.qml (+108/-0) src/qml/SettingsPage/KeyboardRectangle.qml (+77/-0) src/qml/SettingsPage/MultiSim.qml (+113/-0) src/qml/SettingsPage/NoSims.qml (+46/-0) src/qml/SettingsPage/Ofono.qml (+69/-0) src/qml/SettingsPage/OnlineAccountsHelper.qml (+96/-0) src/qml/SettingsPage/ServiceInfo.qml (+133/-0) src/qml/SettingsPage/Services.qml (+74/-0) src/qml/SettingsPage/SettingsItemTitle.qml (+44/-0) src/qml/SettingsPage/SettingsPage.qml (+158/-0) src/qml/SettingsPage/SettingsTextField.qml (+29/-0) src/qml/SettingsPage/SingleSim.qml (+69/-0) src/qml/SettingsPage/VCardParser.qml (+55/-0) src/qml/SettingsPage/callForwardingUtils.js (+126/-0) src/qml/SettingsPage/dateUtils.js (+69/-0) src/qml/dialer-app.qml (+24/-9) |
To merge this branch: | bzr merge lp://staging/dialer-app/staging |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Gustavo Pichorim Boiko (community) | Approve | ||
system-apps-ci-bot | continuous-integration | Approve | |
Review via email: mp+320691@code.staging.launchpad.net |
Commit message
- Adapt to work with VOIP accounts.
- Install 'IM' account application file. Make sure that dialer-app appear on the application list for 'IM' services.
- Allow to expand the keypad.
- Move the phone settings from ubuntu-
Description of the change
- Adapt to work with VOIP accounts.
- Install 'IM' account application file. Make sure that dialer-app appear on the application list for 'IM' services.
- Allow to expand the keypad.
- Move the phone settings from ubuntu-
Unmerged revisions
- 562. By Gustavo Pichorim Boiko
-
Avoid placing multiple calls when pressing enter by removing the focus of the view
- 561. By Gustavo Pichorim Boiko
-
Only try to assing previously set values if they are available.
- 560. By Tiago Salem Herrmann
-
Use HistoryUnionFilter to force history model query the server
- 559. By Gustavo Pichorim Boiko
-
Move the phone settings from ubuntu-
system- settings to dialer-app. - 558. By Gustavo Pichorim Boiko
-
Allow to expand the keypad.
- 557. By Gustavo Pichorim Boiko
-
Install 'IM' account application file.
Make sure that dialer-app appear on the application list for 'IM' services.
- 556. By Gustavo Pichorim Boiko
-
Adapt to work with VOIP accounts.
- 555. By Gustavo Pichorim Boiko
-
Sync with trunk.
PASSED: Continuous integration, rev:559 /jenkins. canonical. com/system- apps/job/ lp-dialer- app-ci/ 2/ /jenkins. canonical. com/system- apps/job/ build/2339 /jenkins. canonical. com/system- apps/job/ build-0- fetch/2338 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 2160 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 2160/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= zesty/2160 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= zesty/2160/ artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 2160 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 2160/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= zesty/2160 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= zesty/2160/ artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 2160 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 2160/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= zesty/2160 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= zesty/2160/ artifact/ output/ *zip*/output. zip
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild: /jenkins. canonical. com/system- apps/job/ lp-dialer- app-ci/ 2/rebuild
https:/