lp:~ubuntu-clock-dev/ubuntu-clock-app/stopwatch-feature-staging

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu-clock-app at revision 340

Ubuntu Phone Apps Jenkins Bot: Approve (continuous-integration) on 2015-08-20

Bartosz Kosiorek: Approve on 2015-08-20

Victor Thompson: Needs Fixing on 2015-08-06

Diff: 2139 lines (+1391/-309)

32 files modified

AUTHORS (+1/-0)
app/CMakeLists.txt (+2/-0)
app/MainPage.qml (+121/-0)
app/clock/ClockPage.qml (+126/-176)
app/components/ActionIcon.qml (+45/-0)
app/components/CMakeLists.txt (+2/-0)
app/components/HeaderNavigation.qml (+86/-0)
app/graphics/CMakeLists.txt (+2/-0)
app/graphics/Stopwatch_Placeholder.svg (+19/-0)
app/graphics/WorldClock_Placeholder.svg (+22/-0)
app/stopwatch/CMakeLists.txt (+11/-0)
app/stopwatch/LapListView.qml (+140/-0)
app/stopwatch/StopwatchFace.qml (+61/-0)
app/stopwatch/StopwatchPage.qml (+169/-0)
app/stopwatch/StopwatchUtils.qml (+73/-0)
app/ubuntu-clock-app.qml (+19/-20)
app/worldclock/AddWorldCityButton.qml (+8/-4)
app/worldclock/UserWorldCityList.qml (+94/-93)
backend/CMakeLists.txt (+25/-0)
backend/modules/Stopwatch/LapHistory/backend.cpp (+34/-0)
backend/modules/Stopwatch/LapHistory/backend.h (+35/-0)
backend/modules/Stopwatch/LapHistory/history.cpp (+97/-0)
backend/modules/Stopwatch/LapHistory/history.h (+64/-0)
backend/modules/Stopwatch/LapHistory/qmldir (+2/-0)
debian/changelog (+2/-0)
debian/control (+2/-0)
po/com.ubuntu.clock.pot (+38/-8)
tests/unit/CMakeLists.txt (+2/-0)
tests/unit/MockClockApp.qml (+6/-5)
tests/unit/tst_stopwatchUtils.qml (+79/-0)
tests/unit/tst_worldClock.qml (+1/-1)
ubuntu-clock-app.json (+3/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1437313: [Clock] No stopwatch feature present

Wishlist

Fix Released

Link a bug report

Related blueprints

380. By Nekhelesh Ramananthan on 2015-08-20

Updated pot file one last time

379. By Nekhelesh Ramananthan on 2015-08-20

Merged bartosz stopwatch-feature-extended branch

Merged branch lp:~ubuntu-clock-dev/ubuntu-clock-app/stopwatch-feature-extended

Bug #1484942: [clock][ux] Stopwatch should keep running (in the background) even when the phone/clock app is turned off

378. By Nekhelesh Ramananthan on 2015-08-20

Fixed minor anchoring issue

377. By Nekhelesh Ramananthan on 2015-08-20

Changed color of settings icon to match rest of the header icons

376. By Nekhelesh Ramananthan on 2015-08-20

Increased height of add world city button container

375. By Nekhelesh Ramananthan on 2015-08-20

Disabled page swipe gesture after getting approval from james

374. By Nekhelesh Ramananthan on 2015-08-18

Merged lp:ubuntu-clock-app

373. By Nekhelesh Ramananthan on 2015-08-17

Reduced font size of milliseconds and hid the hours in the laptime when possible. Added units to cover this function

372. By Nekhelesh Ramananthan on 2015-08-17

Added comment

371. By Nekhelesh Ramananthan on 2015-08-17

More code cleanup