Merge lp://staging/~nik90/ubuntu-clock-app/sunrise-u1db-transition into lp://staging/ubuntu-clock-app/saucy

Proposed by Nekhelesh Ramananthan
Status: Merged
Approved by: Nekhelesh Ramananthan
Approved revision: 318
Merged at revision: 323
Proposed branch: lp://staging/~nik90/ubuntu-clock-app/sunrise-u1db-transition
Merge into: lp://staging/ubuntu-clock-app/saucy
Diff against target: 179 lines (+49/-86)
3 files modified
clock/EasterEgg.qml (+12/-10)
clock/EasterEggStorage.js (+0/-76)
clock/EasterEggStorage.qml (+37/-0)
To merge this branch: bzr merge lp://staging/~nik90/ubuntu-clock-app/sunrise-u1db-transition
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Andrew Hayzen (community) Approve
Ubuntu Clock Developers Pending
Review via email: mp+204449@code.staging.launchpad.net

Commit message

Transitioned sunrise/sunset times cache from LocalStorage to U1db.

Description of the change

Transitioned sunrise/sunset times cache from LocalStorage to U1db.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Andrew Hayzen (ahayzen) wrote :

The changes in the merge look good to me.

As a note I got the following error when starting the application.
file:///home/andy/Workspace/sdk/~nik90-sunrise-u1db-transition/common/ClockBase.qml:94: TypeError: Cannot read property 'timeFormat' of undefined
This appears to be related to the appSetting U1DB.

review: Approve
Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

> As a note I got the following error when starting the application.
> file:///home/andy/Workspace/sdk/~nik90-sunrise-u1db-
> transition/common/ClockBase.qml:94: TypeError: Cannot read property
> 'timeFormat' of undefined
> This appears to be related to the appSetting U1DB.

Yes I noticed this yesterday. It started appearing after Victor's patch. I will address in the next MP with some other fixes.

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
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