lp:~ibelieve/ubuntu-clock-app/initial-convergent-layout

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:ubuntu-clock-app/saucy

Victor Thompson: Needs Fixing on 2014-02-01

Nekhelesh Ramananthan: Needs Fixing on 2014-01-27

Ubuntu Phone Apps Jenkins Bot: Approve (continuous-integration) on 2014-01-27

Diff: 510 lines (+344/-32)

8 files modified

alarm/AlarmPage.qml (+11/-6)
clock/ClockPage.qml (+108/-22)
common/Sidebar.qml (+146/-0)
common/VerticalDivider.qml (+49/-0)
stopwatch/StopwatchPage.qml (+14/-0)
tests/autopilot/ubuntu_clock_app/tests/test_clock.py (+2/-1)
timer/TimerPage.qml (+9/-2)
ubuntu-clock-app.qml (+5/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

267. By Michael Spencer on 2014-01-27

(Hopefully) fixed the autopilot tests to work with the convergent layout

266. By Michael Spencer on 2014-01-27

Merged in trunk and made some changes to the Settings button

265. By Michael Spencer on 2014-01-27

Finished Clocks convergent layout

264. By Michael Spencer on 2013-11-25

Initial convergent layout for the Clock tab

263. By Launchpad Translations on behalf of ubuntu-clock-dev on 2013-11-21

Launchpad automatic translations update.

262. By Nekhelesh Ramananthan on 2013-11-20

Adds confirm to delete option to clock, alarm, timer and stopwatch. It also removes the custom swipe delete class since it is now provided by the SDK. Autopilot tests have been fixed, cleaned and ported to Autopilot 1.4. They also make more use of upstream UITK emulator functions. Fixes: https://bugs.launchpad.net/bugs/1242084.

Approved by Nicholas Skaggs, Ubuntu Phone Apps Jenkins Bot.

261. By Launchpad Translations on behalf of ubuntu-clock-dev on 2013-11-18

Launchpad automatic translations update.

260. By Riccardo Padovani on 2013-11-10

Fix for #1249630. Fixes: https://bugs.launchpad.net/bugs/1249630.

Approved by Nekhelesh Ramananthan, Ubuntu Phone Apps Jenkins Bot.

259. By Launchpad Translations on behalf of ubuntu-clock-dev on 2013-11-10

Launchpad automatic translations update.

258. By Thomi Richards on 2013-11-06

Updates for autopilot 1.4 compatibility.

Approved by Ubuntu Phone Apps Jenkins Bot.