lp:~rpadovani/ubuntu-calculator-app/bumpToolkit

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu-calculator-app at revision 241

Jenkins Bot: Approve (continuous-integration) on 2015-11-24

Bartosz Kosiorek: Needs Fixing on 2015-11-24

Ubuntu Phone Apps Jenkins Bot: Approve (continuous-integration) on 2015-11-09

Diff: 539 lines (+148/-100)

16 files modified

app/engine/CalculationHistory.qml (+2/-2)
app/ubuntu-calculator-app.qml (+61/-64)
app/ui/CalcKeyboard.qml (+3/-3)
app/ui/FavouritePage.qml (+3/-3)
app/ui/KeyboardButton.qml (+3/-3)
app/ui/KeyboardPage.qml (+19/-2)
app/ui/LandscapeKeyboard.qml (+20/-2)
app/ui/PortraitKeyboard.qml (+19/-2)
app/ui/Screen.qml (+2/-2)
app/ui/ScrollableView.qml (+2/-2)
app/upstreamcomponents/EmptyState.qml (+2/-2)
app/upstreamcomponents/ListItemWithActions.qml (+3/-3)
app/upstreamcomponents/ListItemWithActionsCheckBox.qml (+3/-3)
app/upstreamcomponents/MultipleSelectionVisualModel.qml (+1/-1)
app/upstreamcomponents/PageWithBottomEdge.qml (+4/-5)
manifest.json.in (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1413789: Calculator should use MainView and Page instead of Headers	Medium	Fix Released
Bug #1508363: Coordinated migration to UITK 1.3	High	Fix Released

Link a bug report

Related blueprints

242. By Riccardo Padovani on 2015-11-24

Merge upstream and fix conflicts

241. By Riccardo Padovani on 2015-11-22

Force the keyboard to stay at bottom at startup

240. By Riccardo Padovani on 2015-11-10

Explicit set the size of page with bottom edge to avoid warnings

239. By Riccardo Padovani on 2015-11-10

Bump CalculationHistory as well

238. By Riccardo Padovani on 2015-11-10

Fix color warning in the page with bottom edge

237. By Riccardo Padovani on 2015-11-09

Update manifest.json

236. By Riccardo Padovani on 2015-11-09

Drop unused line

235. By Riccardo Padovani on 2015-11-09

Fix bug 1413789

234. By Riccardo Padovani on 2015-11-09

Bump toolkit and update header

233. By Launchpad Translations on behalf of ubuntu-calculator-dev on 2015-11-06

Launchpad automatic translations update.