lp:~nik90/ubuntu-clock-app/transition-worldclock-u1db

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu-clock-app/saucy at revision 329

Ubuntu Phone Apps Jenkins Bot: Approve (continuous-integration) on 2014-02-08

Riccardo Padovani: Approve on 2014-02-06

Andrew Hayzen: Pending (u1db) requested 2014-02-05

Ubuntu Clock Developers: Pending requested 2014-02-05

Diff: 540 lines (+106/-255)

6 files modified

clock/ClockPage.qml (+80/-31)
clock/WorldClock.qml (+5/-4)
clock/WorldClockModel.qml (+0/-199)
tests/autopilot/ubuntu_clock_app/emulators.py (+1/-1)
tests/autopilot/ubuntu_clock_app/tests/test_clock.py (+20/-12)
ubuntu-clock-app.qml (+0/-8)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

331. By Nekhelesh Ramananthan on 2014-02-05

fixed cities with same name in different countries not being added

330. By Nekhelesh Ramananthan on 2014-02-05

Fixed delete world city test

329. By Nekhelesh Ramananthan on 2014-02-05

Fixed autopilot test issue

328. By Nekhelesh Ramananthan on 2014-02-05

Fixed u1db not being able to save city names with a space

327. By Nekhelesh Ramananthan on 2014-02-05

Transitioned world clocks to u1db and did some code cleanups

326. By Nekhelesh Ramananthan on 2014-02-05

Transitioned current location storage to u1db

325. By Nekhelesh Ramananthan on 2014-02-05

merge from trunk

324. By Nekhelesh Ramananthan on 2014-02-04

Fixes the issue of overflowing labels in the clock, alarm and timer tabs. Also rearranges the alarm column to maintain consistency with other tabs. Fixes: https://bugs.launchpad.net/bugs/1275720.

Approved by Riccardo Padovani, Ubuntu Phone Apps Jenkins Bot.

323. By Nekhelesh Ramananthan on 2014-02-03

Transitioned sunrise/sunset times cache from LocalStorage to U1db. Fixes: https://bugs.launchpad.net/bugs/1269159.

Approved by Ubuntu Phone Apps Jenkins Bot, Andrew Hayzen.

322. By Michal Predotka on 2014-02-03

Make timer hands snap to digits. Do not show 60 value for minutes and seconds in timer. Fixes: https://bugs.launchpad.net/bugs/1274127, https://bugs.launchpad.net/bugs/1274270.

Approved by Ubuntu Phone Apps Jenkins Bot, Nekhelesh Ramananthan.