lp:~zsombi/ubuntu-ui-toolkit/60-action-value-type

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~zsombi/ubuntu-ui-toolkit/listitem-master at revision 1277

Tim Peeters: Approve on 2014-12-02

Zsombor Egri: Pending (continuous-integration) requested 2014-09-18

Diff: 283 lines (+102/-13)

7 files modified

modules/Ubuntu/Components/Themes/Ambiance/ListItemPanel.qml (+1/-0)
modules/Ubuntu/Components/plugin/ucaction.h (+1/-0)
modules/Ubuntu/Components/plugin/uclistitem.cpp (+2/-2)
modules/Ubuntu/Components/plugin/uclistitemactions.cpp (+36/-1)
modules/Ubuntu/Components/plugin/uclistitemactions_p.h (+6/-0)
tests/resources/listitems/ListItemTest.qml (+9/-7)
tests/unit_x11/tst_components/tst_listitem.qml (+47/-3)

api

Superseded for merging into lp:~bzoltan/ubuntu-ui-toolkit/new_list_item

PS Jenkins bot: Pending (continuous-integration) requested 2014-09-15

Ubuntu SDK team: Pending requested 2014-09-15

Diff: 270 lines (+93/-17)

6 files modified

modules/Ubuntu/Components/ListItemPanel.qml (+23/-1)
modules/Ubuntu/Components/plugin/uclistitem.cpp (+10/-1)
modules/Ubuntu/Components/plugin/uclistitem_p.h (+1/-0)
modules/Ubuntu/Components/plugin/uclistitemoptions.cpp (+2/-1)
tests/resources/listitems/ListItemTest.qml (+6/-7)
tests/unit_x11/tst_components/tst_listitem.qml (+51/-7)

api

Superseded for merging into lp:ubuntu-ui-toolkit/staging

PS Jenkins bot: Needs Fixing (continuous-integration) on 2014-09-01

Ubuntu SDK team: Pending requested 2014-08-30

Diff: 270 lines (+93/-17)

6 files modified

modules/Ubuntu/Components/ListItemPanel.qml (+23/-1)
modules/Ubuntu/Components/plugin/uclistitem.cpp (+10/-1)
modules/Ubuntu/Components/plugin/uclistitem_p.h (+1/-0)
modules/Ubuntu/Components/plugin/uclistitemoptions.cpp (+2/-1)
tests/resources/listitems/ListItemTest.qml (+6/-7)
tests/unit_x11/tst_components/tst_listitem.qml (+51/-7)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1297. By Zsombor Egri on 2014-12-01

prereq sync

1296. By Zsombor Egri on 2014-12-01

prereq sync

1295. By Zsombor Egri on 2014-12-01

action parameter type restrictions documentation reformulated

1294. By Zsombor Egri on 2014-12-01

prere sync

1293. By Zsombor Egri on 2014-12-01

move action parameterType checking to C++ at the action's addition time

1292. By Zsombor Egri on 2014-12-01

prereq sync

1291. By Zsombor Egri on 2014-12-01

prereq sync

1290. By Zsombor Egri on 2014-11-28

prereq sync

1289. By Zsombor Egri on 2014-11-25

semicolon removal rolled back

1288. By Zsombor Egri on 2014-11-25

prereq sync