lp:~unity-team/unity8/scopes-v4

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:unity8 at revision 1128

PS Jenkins bot (community): Needs Fixing (continuous-integration) on 2014-08-06

Michal Hruby (community): Approve on 2014-08-06

Michał Sawicz: Approve on 2014-08-06

Albert Astals Cid: Pending requested 2014-08-06

Diff: 1551 lines (+431/-353)

18 files modified

debian/control (+2/-2)
qml/Dash/Dash.qml (+9/-11)
qml/Dash/DashContent.qml (+3/-5)
qml/Dash/DashNavigation.qml (+44/-44)
qml/Dash/DashNavigationList.qml (+14/-14)
qml/Dash/GenericScopeView.qml (+4/-14)
qml/ScopeTool.qml (+1/-11)
tests/mocks/Unity/CMakeLists.txt (+3/-3)
tests/mocks/Unity/Unity.qmltypes (+87/-35)
tests/mocks/Unity/fake_navigation.cpp (+36/-44)
tests/mocks/Unity/fake_navigation.h (+13/-13)
tests/mocks/Unity/fake_scope.cpp (+73/-25)
tests/mocks/Unity/fake_scope.h (+16/-8)
tests/mocks/Unity/fake_scopes.cpp (+10/-2)
tests/mocks/Unity/fake_scopes.h (+1/-0)
tests/mocks/Unity/fake_unity_plugin.cpp (+2/-2)
tests/qmltests/Dash/tst_Dash.qml (+5/-9)
tests/qmltests/Dash/tst_DashContent.qml (+108/-111)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1105. By Albert Astals Cid on 2014-08-06

More updates

1104. By Albert Astals Cid on 2014-08-06

New need implementation

1103. By Albert Astals Cid on 2014-08-06

more renaming

1102. By Albert Astals Cid on 2014-08-06

Fix merge/tests

1101. By Albert Astals Cid on 2014-08-06

Merge unstable departments test

1100. By Albert Astals Cid on 2014-08-06

Merge dashSepartmentsListTweaks

1099. By Albert Astals Cid on 2014-08-06

Dummy implement refresh()

1098. By Albert Astals Cid on 2014-08-05

Merge

1097. By Albert Astals Cid on 2014-08-04

Adapt to API changes

1096. By Albert Astals Cid on 2014-08-04

need new api-dev