Merge lp://qastaging/~rpadovani/ubuntu-calculator-app/fix-for-1156520 into lp://qastaging/~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

Proposed by Riccardo Padovani
Status: Merged
Approved by: Dalius
Approved revision: 35
Merged at revision: 35
Proposed branch: lp://qastaging/~rpadovani/ubuntu-calculator-app/fix-for-1156520
Merge into: lp://qastaging/~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk
Diff against target: 199 lines (+117/-3)
5 files modified
Simple/Memory.qml (+1/-0)
Simple/Screen.qml (+19/-0)
Simple/SimplePage.qml (+15/-3)
Storage.qml (+75/-0)
debian/changelog (+7/-0)
To merge this branch: bzr merge lp://qastaging/~rpadovani/ubuntu-calculator-app/fix-for-1156520
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Dalius (community) Approve
Review via email: mp+154431@code.qastaging.launchpad.net

Commit message

Fixed bug 1156520:
- added label for date
- added function to convert timestamp in a string

Description of the change

Fixed bug 1156520:
- added label for date
- added function to convert timestamp in a string

To post a comment you must log in.
Revision history for this message
Dalius (dalius-sandbox) wrote :

We will definitely have problems with l10n with this but we can address that later.

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~rpadovani/ubuntu-calculator-app/fix-for-1156520/+merge/154431/+edit-commit-message

review: Needs Fixing (continuous-integration)
Revision history for this message
Riccardo Padovani (rpadovani) wrote :

> FAILED: Autolanding.
> No commit message was specified in the merge proposal. Hit 'Add commit
> message' on the merge proposal web page or follow the link below. You can
> approve the merge proposal yourself to rerun.
> https://code.launchpad.net/~rpadovani/ubuntu-calculator-app/fix-
> for-1156520/+merge/154431/+edit-commit-message

Done...

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

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